Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Geert Uytterhoeven and committed by
Linus Torvalds
36dff96b 0465f790

+7 -1
+5 -1
arch/powerpc/platforms/ps3/htab.c
··· 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 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 ··· 234 233 235 234 static void ps3_hpte_clear(void) 236 235 { 236 + /* Make sure to clean up the frame buffer device first */ 237 + ps3fb_cleanup(); 238 + 237 239 lv1_unmap_htab(htab_addr); 238 240 } 239 241
+2
include/asm-powerpc/ps3fb.h
··· 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__ */