diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-15 00:22:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-15 00:22:33 -0500 |
commit | b9e222904ce92e1b277f2b85411d1eb6bfe27410 (patch) | |
tree | 9458158ea70e6025723c53afc64ed61d044580b8 /arch | |
parent | 4a0962abd187df29b7d1378b2f372a55667d54c0 (diff) | |
parent | d4eac7501f737c70420f38e9fd59de77a4ba6c13 (diff) |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Remove unused CONFIG_WANT_DEVICE_TREE
[POWERPC] Cell RAS: Remove DEBUG, and add license and copyright
[POWERPC] hvc_rtas_init() must be __init
[POWERPC] free_property() must not be __init
[POWERPC] vdso_do_func_patch{32,64}() must be __init
[POWERPC] Remove generated files on make clean
[POWERPC] Fix arch/ppc compilation - add typedef for pgtable_t
[POWERPC] Wire up new timerfd syscalls
[POWERPC] PS3: Update sys-manager button events
[POWERPC] PS3: Sys-manager code cleanup
[POWERPC] PS3: Use system reboot on restart
[POWERPC] PS3: Fix bootwrapper hang bug
[POWERPC] PS3: Fix reading pm interval in logical performance monitor
[POWERPC] PS3: Fix setting bookmark in logical performance monitor
[POWERPC] Fix DEBUG_PREEMPT warning when warning
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/Kconfig | 4 | ||||
-rw-r--r-- | arch/powerpc/boot/Makefile | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/ps3-hvcall.S | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/Makefile | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/process.c | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/vdso.c | 12 | ||||
-rw-r--r-- | arch/powerpc/platforms/512x/Kconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/52xx/Kconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/Kconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/Kconfig.cputype | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/cell/ras.c | 11 | ||||
-rw-r--r-- | arch/powerpc/platforms/embedded6xx/Kconfig | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/iseries/vio.c | 2 |
13 files changed, 23 insertions, 27 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 485513c9f1af..5b8d8382b762 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -442,10 +442,6 @@ config SECCOMP | |||
442 | 442 | ||
443 | If unsure, say Y. Only embedded should say N here. | 443 | If unsure, say Y. Only embedded should say N here. |
444 | 444 | ||
445 | config WANT_DEVICE_TREE | ||
446 | bool | ||
447 | default n | ||
448 | |||
449 | endmenu | 445 | endmenu |
450 | 446 | ||
451 | config ISA_DMA_API | 447 | config ISA_DMA_API |
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 49797a45416c..63d07ccbb9db 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile | |||
@@ -147,6 +147,8 @@ HOSTCFLAGS += -I$(src)/dtc-src/ -I$(src)/libfdt/ | |||
147 | targets += dtc-src/dtc-parser.tab.c | 147 | targets += dtc-src/dtc-parser.tab.c |
148 | targets += dtc-src/dtc-lexer.lex.c | 148 | targets += dtc-src/dtc-lexer.lex.c |
149 | 149 | ||
150 | clean-files += dtc-src/dtc-parser.tab.h | ||
151 | |||
150 | ifdef DTC_GENPARSER | 152 | ifdef DTC_GENPARSER |
151 | BISON = bison | 153 | BISON = bison |
152 | FLEX = flex | 154 | FLEX = flex |
diff --git a/arch/powerpc/boot/ps3-hvcall.S b/arch/powerpc/boot/ps3-hvcall.S index 585965f7e6a8..d6068f1829ca 100644 --- a/arch/powerpc/boot/ps3-hvcall.S +++ b/arch/powerpc/boot/ps3-hvcall.S | |||
@@ -145,7 +145,7 @@ | |||
145 | .macro STORE_REGS_5_2 | 145 | .macro STORE_REGS_5_2 |
146 | lwz r11, 16(r1) | 146 | lwz r11, 16(r1) |
147 | std r4, 0(r11) | 147 | std r4, 0(r11) |
148 | lwz r11, 24(r1) | 148 | lwz r11, 20(r1) |
149 | std r5, 0(r11) | 149 | std r5, 0(r11) |
150 | .endm | 150 | .endm |
151 | 151 | ||
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 0662ae46f724..c1baf9d5903f 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile | |||
@@ -104,3 +104,5 @@ quiet_cmd_systbl_chk = CALL $< | |||
104 | PHONY += systbl_chk | 104 | PHONY += systbl_chk |
105 | systbl_chk: $(src)/systbl_chk.sh $(obj)/systbl_chk.i | 105 | systbl_chk: $(src)/systbl_chk.sh $(obj)/systbl_chk.i |
106 | $(call cmd,systbl_chk) | 106 | $(call cmd,systbl_chk) |
107 | |||
108 | clean-files := vmlinux.lds | ||
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index b9d88374f14f..4846bf543a8c 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c | |||
@@ -462,7 +462,7 @@ void show_regs(struct pt_regs * regs) | |||
462 | current, task_pid_nr(current), current->comm, task_thread_info(current)); | 462 | current, task_pid_nr(current), current->comm, task_thread_info(current)); |
463 | 463 | ||
464 | #ifdef CONFIG_SMP | 464 | #ifdef CONFIG_SMP |
465 | printk(" CPU: %d", smp_processor_id()); | 465 | printk(" CPU: %d", raw_smp_processor_id()); |
466 | #endif /* CONFIG_SMP */ | 466 | #endif /* CONFIG_SMP */ |
467 | 467 | ||
468 | for (i = 0; i < 32; i++) { | 468 | for (i = 0; i < 32; i++) { |
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c index 3702df7dc567..d3437c4c4a6f 100644 --- a/arch/powerpc/kernel/vdso.c +++ b/arch/powerpc/kernel/vdso.c | |||
@@ -336,9 +336,9 @@ static unsigned long __init find_function32(struct lib32_elfinfo *lib, | |||
336 | return sym->st_value - VDSO32_LBASE; | 336 | return sym->st_value - VDSO32_LBASE; |
337 | } | 337 | } |
338 | 338 | ||
339 | static int vdso_do_func_patch32(struct lib32_elfinfo *v32, | 339 | static int __init vdso_do_func_patch32(struct lib32_elfinfo *v32, |
340 | struct lib64_elfinfo *v64, | 340 | struct lib64_elfinfo *v64, |
341 | const char *orig, const char *fix) | 341 | const char *orig, const char *fix) |
342 | { | 342 | { |
343 | Elf32_Sym *sym32_gen, *sym32_fix; | 343 | Elf32_Sym *sym32_gen, *sym32_fix; |
344 | 344 | ||
@@ -433,9 +433,9 @@ static unsigned long __init find_function64(struct lib64_elfinfo *lib, | |||
433 | #endif | 433 | #endif |
434 | } | 434 | } |
435 | 435 | ||
436 | static int vdso_do_func_patch64(struct lib32_elfinfo *v32, | 436 | static int __init vdso_do_func_patch64(struct lib32_elfinfo *v32, |
437 | struct lib64_elfinfo *v64, | 437 | struct lib64_elfinfo *v64, |
438 | const char *orig, const char *fix) | 438 | const char *orig, const char *fix) |
439 | { | 439 | { |
440 | Elf64_Sym *sym64_gen, *sym64_fix; | 440 | Elf64_Sym *sym64_gen, *sym64_fix; |
441 | 441 | ||
diff --git a/arch/powerpc/platforms/512x/Kconfig b/arch/powerpc/platforms/512x/Kconfig index c6fa49e23dc0..4c0da0c079e9 100644 --- a/arch/powerpc/platforms/512x/Kconfig +++ b/arch/powerpc/platforms/512x/Kconfig | |||
@@ -13,7 +13,6 @@ config MPC5121_ADS | |||
13 | bool "Freescale MPC5121E ADS" | 13 | bool "Freescale MPC5121E ADS" |
14 | depends on PPC_MULTIPLATFORM && PPC32 | 14 | depends on PPC_MULTIPLATFORM && PPC32 |
15 | select DEFAULT_UIMAGE | 15 | select DEFAULT_UIMAGE |
16 | select WANT_DEVICE_TREE | ||
17 | select PPC_MPC5121 | 16 | select PPC_MPC5121 |
18 | help | 17 | help |
19 | This option enables support for the MPC5121E ADS board. | 18 | This option enables support for the MPC5121E ADS board. |
diff --git a/arch/powerpc/platforms/52xx/Kconfig b/arch/powerpc/platforms/52xx/Kconfig index 515f244c90bb..cf945d55c276 100644 --- a/arch/powerpc/platforms/52xx/Kconfig +++ b/arch/powerpc/platforms/52xx/Kconfig | |||
@@ -8,7 +8,6 @@ config PPC_MPC5200_SIMPLE | |||
8 | bool "Generic support for simple MPC5200 based boards" | 8 | bool "Generic support for simple MPC5200 based boards" |
9 | depends on PPC_MPC52xx | 9 | depends on PPC_MPC52xx |
10 | select DEFAULT_UIMAGE | 10 | select DEFAULT_UIMAGE |
11 | select WANT_DEVICE_TREE | ||
12 | help | 11 | help |
13 | This option enables support for a simple MPC52xx based boards which | 12 | This option enables support for a simple MPC52xx based boards which |
14 | do not need a custom platform specific setup. Such boards are | 13 | do not need a custom platform specific setup. Such boards are |
@@ -35,7 +34,6 @@ config PPC_LITE5200 | |||
35 | bool "Freescale Lite5200 Eval Board" | 34 | bool "Freescale Lite5200 Eval Board" |
36 | depends on PPC_MPC52xx | 35 | depends on PPC_MPC52xx |
37 | select DEFAULT_UIMAGE | 36 | select DEFAULT_UIMAGE |
38 | select WANT_DEVICE_TREE | ||
39 | 37 | ||
40 | config PPC_MPC5200_BUGFIX | 38 | config PPC_MPC5200_BUGFIX |
41 | bool "MPC5200 (L25R) bugfix support" | 39 | bool "MPC5200 (L25R) bugfix support" |
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig index fcedbec07f94..0afd22595546 100644 --- a/arch/powerpc/platforms/Kconfig +++ b/arch/powerpc/platforms/Kconfig | |||
@@ -15,7 +15,6 @@ config PPC_MULTIPLATFORM | |||
15 | config PPC_82xx | 15 | config PPC_82xx |
16 | bool "Freescale 82xx" | 16 | bool "Freescale 82xx" |
17 | depends on 6xx | 17 | depends on 6xx |
18 | select WANT_DEVICE_TREE | ||
19 | 18 | ||
20 | config PPC_83xx | 19 | config PPC_83xx |
21 | bool "Freescale 83xx" | 20 | bool "Freescale 83xx" |
@@ -23,7 +22,6 @@ config PPC_83xx | |||
23 | select FSL_SOC | 22 | select FSL_SOC |
24 | select MPC83xx | 23 | select MPC83xx |
25 | select IPIC | 24 | select IPIC |
26 | select WANT_DEVICE_TREE | ||
27 | select FSL_EMB_PERFMON | 25 | select FSL_EMB_PERFMON |
28 | 26 | ||
29 | config PPC_86xx | 27 | config PPC_86xx |
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index 69941ba70975..73d81ce14b67 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype | |||
@@ -29,26 +29,22 @@ config PPC_85xx | |||
29 | bool "Freescale 85xx" | 29 | bool "Freescale 85xx" |
30 | select E500 | 30 | select E500 |
31 | select FSL_SOC | 31 | select FSL_SOC |
32 | select WANT_DEVICE_TREE | ||
33 | select MPC85xx | 32 | select MPC85xx |
34 | 33 | ||
35 | config PPC_8xx | 34 | config PPC_8xx |
36 | bool "Freescale 8xx" | 35 | bool "Freescale 8xx" |
37 | select FSL_SOC | 36 | select FSL_SOC |
38 | select 8xx | 37 | select 8xx |
39 | select WANT_DEVICE_TREE | ||
40 | select PPC_LIB_RHEAP | 38 | select PPC_LIB_RHEAP |
41 | 39 | ||
42 | config 40x | 40 | config 40x |
43 | bool "AMCC 40x" | 41 | bool "AMCC 40x" |
44 | select PPC_DCR_NATIVE | 42 | select PPC_DCR_NATIVE |
45 | select WANT_DEVICE_TREE | ||
46 | select PPC_UDBG_16550 | 43 | select PPC_UDBG_16550 |
47 | 44 | ||
48 | config 44x | 45 | config 44x |
49 | bool "AMCC 44x" | 46 | bool "AMCC 44x" |
50 | select PPC_DCR_NATIVE | 47 | select PPC_DCR_NATIVE |
51 | select WANT_DEVICE_TREE | ||
52 | select PPC_UDBG_16550 | 48 | select PPC_UDBG_16550 |
53 | 49 | ||
54 | config E200 | 50 | config E200 |
diff --git a/arch/powerpc/platforms/cell/ras.c b/arch/powerpc/platforms/cell/ras.c index b2494ebcdbe9..e43024c0392e 100644 --- a/arch/powerpc/platforms/cell/ras.c +++ b/arch/powerpc/platforms/cell/ras.c | |||
@@ -1,4 +1,13 @@ | |||
1 | #define DEBUG | 1 | /* |
2 | * Copyright 2006-2008, IBM Corporation. | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public License | ||
6 | * as published by the Free Software Foundation; either version | ||
7 | * 2 of the License, or (at your option) any later version. | ||
8 | */ | ||
9 | |||
10 | #undef DEBUG | ||
2 | 11 | ||
3 | #include <linux/types.h> | 12 | #include <linux/types.h> |
4 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig index 6c8083757938..429088967813 100644 --- a/arch/powerpc/platforms/embedded6xx/Kconfig +++ b/arch/powerpc/platforms/embedded6xx/Kconfig | |||
@@ -24,7 +24,6 @@ config STORCENTER | |||
24 | select MPIC | 24 | select MPIC |
25 | select FSL_SOC | 25 | select FSL_SOC |
26 | select PPC_UDBG_16550 if SERIAL_8250 | 26 | select PPC_UDBG_16550 if SERIAL_8250 |
27 | select WANT_DEVICE_TREE | ||
28 | select MPC10X_OPENPIC | 27 | select MPC10X_OPENPIC |
29 | select MPC10X_BRIDGE | 28 | select MPC10X_BRIDGE |
30 | help | 29 | help |
@@ -37,7 +36,6 @@ config MPC7448HPC2 | |||
37 | select TSI108_BRIDGE | 36 | select TSI108_BRIDGE |
38 | select DEFAULT_UIMAGE | 37 | select DEFAULT_UIMAGE |
39 | select PPC_UDBG_16550 | 38 | select PPC_UDBG_16550 |
40 | select WANT_DEVICE_TREE | ||
41 | select TSI108_BRIDGE | 39 | select TSI108_BRIDGE |
42 | help | 40 | help |
43 | Select MPC7448HPC2 if configuring for Freescale MPC7448HPC2 (Taiga) | 41 | Select MPC7448HPC2 if configuring for Freescale MPC7448HPC2 (Taiga) |
@@ -48,7 +46,6 @@ config PPC_HOLLY | |||
48 | depends on EMBEDDED6xx | 46 | depends on EMBEDDED6xx |
49 | select TSI108_BRIDGE | 47 | select TSI108_BRIDGE |
50 | select PPC_UDBG_16550 | 48 | select PPC_UDBG_16550 |
51 | select WANT_DEVICE_TREE | ||
52 | select TSI108_BRIDGE | 49 | select TSI108_BRIDGE |
53 | help | 50 | help |
54 | Select PPC_HOLLY if configuring for an IBM 750GX/CL Eval | 51 | Select PPC_HOLLY if configuring for an IBM 750GX/CL Eval |
@@ -59,7 +56,6 @@ config PPC_PRPMC2800 | |||
59 | depends on EMBEDDED6xx | 56 | depends on EMBEDDED6xx |
60 | select MV64X60 | 57 | select MV64X60 |
61 | select NOT_COHERENT_CACHE | 58 | select NOT_COHERENT_CACHE |
62 | select WANT_DEVICE_TREE | ||
63 | help | 59 | help |
64 | This option enables support for the Motorola PrPMC2800 board | 60 | This option enables support for the Motorola PrPMC2800 board |
65 | 61 | ||
diff --git a/arch/powerpc/platforms/iseries/vio.c b/arch/powerpc/platforms/iseries/vio.c index be06cfd9fa3d..657b72f68493 100644 --- a/arch/powerpc/platforms/iseries/vio.c +++ b/arch/powerpc/platforms/iseries/vio.c | |||
@@ -75,7 +75,7 @@ static struct property *new_property(const char *name, int length, | |||
75 | return np; | 75 | return np; |
76 | } | 76 | } |
77 | 77 | ||
78 | static void __init free_property(struct property *np) | 78 | static void free_property(struct property *np) |
79 | { | 79 | { |
80 | kfree(np); | 80 | kfree(np); |
81 | } | 81 | } |