git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ../mmc
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
ps3
/
setup.c
diff --git
a/arch/powerpc/platforms/ps3/setup.c
b/arch/powerpc/platforms/ps3/setup.c
index
77bc330
..
35f3e85
100644
(file)
--- a/
arch/powerpc/platforms/ps3/setup.c
+++ b/
arch/powerpc/platforms/ps3/setup.c
@@
-23,7
+23,6
@@
#include <linux/fs.h>
#include <linux/root_dev.h>
#include <linux/console.h>
#include <linux/fs.h>
#include <linux/root_dev.h>
#include <linux/console.h>
-#include <linux/kexec.h>
#include <linux/bootmem.h>
#include <asm/machdep.h>
#include <linux/bootmem.h>
#include <asm/machdep.h>
@@
-42,6
+41,10
@@
#define DBG pr_debug
#endif
#define DBG pr_debug
#endif
+/* mutex synchronizing GPU accesses and video mode changes */
+DEFINE_MUTEX(ps3_gpu_mutex);
+EXPORT_SYMBOL_GPL(ps3_gpu_mutex);
+
#if !defined(CONFIG_SMP)
static void smp_send_stop(void) {}
#endif
#if !defined(CONFIG_SMP)
static void smp_send_stop(void) {}
#endif
@@
-277,8
+280,5
@@
define_machine(ps3) {
.halt = ps3_halt,
#if defined(CONFIG_KEXEC)
.kexec_cpu_down = ps3_kexec_cpu_down,
.halt = ps3_halt,
#if defined(CONFIG_KEXEC)
.kexec_cpu_down = ps3_kexec_cpu_down,
- .machine_kexec = default_machine_kexec,
- .machine_kexec_prepare = default_machine_kexec_prepare,
- .machine_crash_shutdown = default_machine_crash_shutdown,
#endif
};
#endif
};