Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 36dff96b3b83c5d79a45b221adf137b571b03d65

Authored by Geert Uytterhoeven
Committed by Linus Torvalds
1 parent 0465f790e0
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] ps3: cleanup ps3fb before clearing HPTE 

PS3: Cleanup the frame buffer device before clearing the HPTE mapping

Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Cc: James Simmons <jsimmons@infradead.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 7 additions and 1 deletions Side-by-side Diff

arch/powerpc/platforms/ps3/htab.c
Diff comments   View file @ 36dff96
... ... @@ -2,7 +2,7 @@
2 2 * PS3 pagetable management routines.
3 3 *
4 4 * Copyright (C) 2006 Sony Computer Entertainment Inc.
5   - * Copyright 2006 Sony Corp.
  5 + * Copyright 2006, 2007 Sony Corporation
6 6 *
7 7 * This program is free software; you can redistribute it and/or modify
8 8 * it under the terms of the GNU General Public License as published by
... ... @@ -24,6 +24,7 @@
24 24 #include <asm/lmb.h>
25 25 #include <asm/udbg.h>
26 26 #include <asm/lv1call.h>
  27 +#include <asm/ps3fb.h>
27 28  
28 29 #include "platform.h"
29 30  
... ... @@ -233,6 +234,9 @@
233 234  
234 235 static void ps3_hpte_clear(void)
235 236 {
  237 + /* Make sure to clean up the frame buffer device first */
  238 + ps3fb_cleanup();
  239 +
236 240 lv1_unmap_htab(htab_addr);
237 241 }
238 242  
include/asm-powerpc/ps3fb.h
Diff comments   View file @ 36dff96
... ... @@ -45,8 +45,10 @@
45 45  
46 46 #ifdef CONFIG_FB_PS3
47 47 extern void ps3fb_flip_ctl(int on);
  48 +extern void ps3fb_cleanup(void);
48 49 #else
49 50 static inline void ps3fb_flip_ctl(int on) {}
  51 +static inline void ps3fb_cleanup(void) {}
50 52 #endif
51 53  
52 54 #endif /* __KERNEL__ */