From 2d28e815e95d81a79f93bdbbb9f320108f4afcb3 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Date: Mon, 12 Feb 2007 00:55:26 -0800
Subject: [PATCH] --- yaml --- r: 48075 b: refs/heads/master c:
 36dff96b3b83c5d79a45b221adf137b571b03d65 h: refs/heads/master i:   48073:
 c459f74eeaa7c96b06931e9c751da97d206cbb71   48071:
 808f52cc12cc5b74d42c50f757550b9e9228d0de v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/powerpc/platforms/ps3/htab.c | 6 +++++-
 trunk/include/asm-powerpc/ps3fb.h       | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e146455c0a66..b82ee236541a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0465f790e06d6dbc07d9b569b74ee8154dfca280
+refs/heads/master: 36dff96b3b83c5d79a45b221adf137b571b03d65
diff --git a/trunk/arch/powerpc/platforms/ps3/htab.c b/trunk/arch/powerpc/platforms/ps3/htab.c
index a4b5a1bc60f4..e12e59fea13a 100644
--- a/trunk/arch/powerpc/platforms/ps3/htab.c
+++ b/trunk/arch/powerpc/platforms/ps3/htab.c
@@ -2,7 +2,7 @@
  *  PS3 pagetable management routines.
  *
  *  Copyright (C) 2006 Sony Computer Entertainment Inc.
- *  Copyright 2006 Sony Corp.
+ *  Copyright 2006, 2007 Sony Corporation
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
 #include <asm/lmb.h>
 #include <asm/udbg.h>
 #include <asm/lv1call.h>
+#include <asm/ps3fb.h>
 
 #include "platform.h"
 
@@ -233,6 +234,9 @@ static void ps3_hpte_invalidate(unsigned long slot, unsigned long va,
 
 static void ps3_hpte_clear(void)
 {
+	/* Make sure to clean up the frame buffer device first */
+	ps3fb_cleanup();
+
 	lv1_unmap_htab(htab_addr);
 }
 
diff --git a/trunk/include/asm-powerpc/ps3fb.h b/trunk/include/asm-powerpc/ps3fb.h
index 8933adf535b8..ad81cf431964 100644
--- a/trunk/include/asm-powerpc/ps3fb.h
+++ b/trunk/include/asm-powerpc/ps3fb.h
@@ -45,8 +45,10 @@ struct ps3fb_ioctl_res {
 
 #ifdef CONFIG_FB_PS3
 extern void ps3fb_flip_ctl(int on);
+extern void ps3fb_cleanup(void);
 #else
 static inline void ps3fb_flip_ctl(int on) {}
+static inline void ps3fb_cleanup(void) {}
 #endif
 
 #endif /* __KERNEL__ */