diff options
author | David S. Miller <davem@davemloft.net> | 2008-04-26 06:17:12 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-27 00:41:19 -0400 |
commit | 09337f501ebdd224cd69df6d168a5c4fe75d86fa (patch) | |
tree | 65d174814752d6df5733023ebb089f4a901e4971 /arch | |
parent | 05d515ef3d14eb95ffe9239ec1b8a03b24fa8469 (diff) |
sparc64: Kill CONFIG_SPARC32_COMPAT
It's completely superfluous, CONFIG_COMPAT is sufficient.
What this used to be is an umbrella for enabling code shared
by all 32-bit compat binary support types. But with the
removal of SunOS and Solaris support, the only one left is
Linux 32-bit ELF.
Update defconfig.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sparc64/Kconfig | 7 | ||||
-rw-r--r-- | arch/sparc64/defconfig | 23 | ||||
-rw-r--r-- | arch/sparc64/kernel/Makefile | 4 | ||||
-rw-r--r-- | arch/sparc64/kernel/audit.c | 6 | ||||
-rw-r--r-- | arch/sparc64/kernel/signal.c | 4 |
5 files changed, 16 insertions, 28 deletions
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index d3fa0f8fc613..edbe71e3fab9 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig | |||
@@ -348,15 +348,8 @@ menu "Executable file formats" | |||
348 | 348 | ||
349 | source "fs/Kconfig.binfmt" | 349 | source "fs/Kconfig.binfmt" |
350 | 350 | ||
351 | config SPARC32_COMPAT | ||
352 | bool "Kernel support for 32-bit SPARC binary compatibility" | ||
353 | help | ||
354 | This allows you to run 32-bit binaries on your 64-bit SPARC system. | ||
355 | Everybody wants this; say Y. | ||
356 | |||
357 | config COMPAT | 351 | config COMPAT |
358 | bool | 352 | bool |
359 | depends on SPARC32_COMPAT | ||
360 | default y | 353 | default y |
361 | select COMPAT_BINFMT_ELF | 354 | select COMPAT_BINFMT_ELF |
362 | 355 | ||
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index 92f79680f70d..aff93c9d13f4 100644 --- a/arch/sparc64/defconfig +++ b/arch/sparc64/defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-numa | 3 | # Linux kernel version: 2.6.25 |
4 | # Wed Apr 23 04:49:08 2008 | 4 | # Sat Apr 26 03:11:06 2008 |
5 | # | 5 | # |
6 | CONFIG_SPARC=y | 6 | CONFIG_SPARC=y |
7 | CONFIG_SPARC64=y | 7 | CONFIG_SPARC64=y |
@@ -152,7 +152,9 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y | |||
152 | CONFIG_HUGETLB_PAGE_SIZE_4MB=y | 152 | CONFIG_HUGETLB_PAGE_SIZE_4MB=y |
153 | # CONFIG_HUGETLB_PAGE_SIZE_512K is not set | 153 | # CONFIG_HUGETLB_PAGE_SIZE_512K is not set |
154 | # CONFIG_HUGETLB_PAGE_SIZE_64K is not set | 154 | # CONFIG_HUGETLB_PAGE_SIZE_64K is not set |
155 | # CONFIG_NUMA is not set | 155 | CONFIG_NUMA=y |
156 | CONFIG_NODES_SHIFT=4 | ||
157 | CONFIG_NODES_SPAN_OTHER_NODES=y | ||
156 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 158 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
157 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 159 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
158 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 160 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
@@ -162,12 +164,14 @@ CONFIG_SELECT_MEMORY_MODEL=y | |||
162 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 164 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
163 | CONFIG_SPARSEMEM_MANUAL=y | 165 | CONFIG_SPARSEMEM_MANUAL=y |
164 | CONFIG_SPARSEMEM=y | 166 | CONFIG_SPARSEMEM=y |
167 | CONFIG_NEED_MULTIPLE_NODES=y | ||
165 | CONFIG_HAVE_MEMORY_PRESENT=y | 168 | CONFIG_HAVE_MEMORY_PRESENT=y |
166 | # CONFIG_SPARSEMEM_STATIC is not set | 169 | # CONFIG_SPARSEMEM_STATIC is not set |
167 | CONFIG_SPARSEMEM_EXTREME=y | 170 | CONFIG_SPARSEMEM_EXTREME=y |
168 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | 171 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y |
169 | CONFIG_SPARSEMEM_VMEMMAP=y | 172 | CONFIG_SPARSEMEM_VMEMMAP=y |
170 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 173 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
174 | CONFIG_MIGRATION=y | ||
171 | CONFIG_RESOURCES_64BIT=y | 175 | CONFIG_RESOURCES_64BIT=y |
172 | CONFIG_ZONE_DMA_FLAG=0 | 176 | CONFIG_ZONE_DMA_FLAG=0 |
173 | CONFIG_NR_QUICK=1 | 177 | CONFIG_NR_QUICK=1 |
@@ -191,7 +195,6 @@ CONFIG_SUN_OPENPROMFS=m | |||
191 | CONFIG_BINFMT_ELF=y | 195 | CONFIG_BINFMT_ELF=y |
192 | CONFIG_COMPAT_BINFMT_ELF=y | 196 | CONFIG_COMPAT_BINFMT_ELF=y |
193 | CONFIG_BINFMT_MISC=m | 197 | CONFIG_BINFMT_MISC=m |
194 | CONFIG_SPARC32_COMPAT=y | ||
195 | CONFIG_COMPAT=y | 198 | CONFIG_COMPAT=y |
196 | CONFIG_SYSVIPC_COMPAT=y | 199 | CONFIG_SYSVIPC_COMPAT=y |
197 | CONFIG_SCHED_SMT=y | 200 | CONFIG_SCHED_SMT=y |
@@ -746,13 +749,7 @@ CONFIG_DEVPORT=y | |||
746 | CONFIG_I2C=y | 749 | CONFIG_I2C=y |
747 | CONFIG_I2C_BOARDINFO=y | 750 | CONFIG_I2C_BOARDINFO=y |
748 | # CONFIG_I2C_CHARDEV is not set | 751 | # CONFIG_I2C_CHARDEV is not set |
749 | |||
750 | # | ||
751 | # I2C Algorithms | ||
752 | # | ||
753 | CONFIG_I2C_ALGOBIT=y | 752 | CONFIG_I2C_ALGOBIT=y |
754 | # CONFIG_I2C_ALGOPCF is not set | ||
755 | # CONFIG_I2C_ALGOPCA is not set | ||
756 | 753 | ||
757 | # | 754 | # |
758 | # I2C Hardware Bus support | 755 | # I2C Hardware Bus support |
@@ -780,6 +777,7 @@ CONFIG_I2C_ALGOBIT=y | |||
780 | # CONFIG_I2C_VIA is not set | 777 | # CONFIG_I2C_VIA is not set |
781 | # CONFIG_I2C_VIAPRO is not set | 778 | # CONFIG_I2C_VIAPRO is not set |
782 | # CONFIG_I2C_VOODOO3 is not set | 779 | # CONFIG_I2C_VOODOO3 is not set |
780 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
783 | 781 | ||
784 | # | 782 | # |
785 | # Miscellaneous I2C Chip support | 783 | # Miscellaneous I2C Chip support |
@@ -1026,6 +1024,7 @@ CONFIG_SND_ALI5451=m | |||
1026 | # CONFIG_SND_AU8810 is not set | 1024 | # CONFIG_SND_AU8810 is not set |
1027 | # CONFIG_SND_AU8820 is not set | 1025 | # CONFIG_SND_AU8820 is not set |
1028 | # CONFIG_SND_AU8830 is not set | 1026 | # CONFIG_SND_AU8830 is not set |
1027 | # CONFIG_SND_AW2 is not set | ||
1029 | # CONFIG_SND_AZT3328 is not set | 1028 | # CONFIG_SND_AZT3328 is not set |
1030 | # CONFIG_SND_BT87X is not set | 1029 | # CONFIG_SND_BT87X is not set |
1031 | # CONFIG_SND_CA0106 is not set | 1030 | # CONFIG_SND_CA0106 is not set |
@@ -1097,10 +1096,6 @@ CONFIG_SND_SUN_CS4231=m | |||
1097 | # CONFIG_SND_SOC is not set | 1096 | # CONFIG_SND_SOC is not set |
1098 | 1097 | ||
1099 | # | 1098 | # |
1100 | # SoC Audio support for SuperH | ||
1101 | # | ||
1102 | |||
1103 | # | ||
1104 | # ALSA SoC audio for Freescale SOCs | 1099 | # ALSA SoC audio for Freescale SOCs |
1105 | # | 1100 | # |
1106 | 1101 | ||
diff --git a/arch/sparc64/kernel/Makefile b/arch/sparc64/kernel/Makefile index 63c6ae0dd273..029558222c8f 100644 --- a/arch/sparc64/kernel/Makefile +++ b/arch/sparc64/kernel/Makefile | |||
@@ -20,12 +20,12 @@ obj-$(CONFIG_PCI) += ebus.o isa.o pci_common.o \ | |||
20 | pci_sun4v.o pci_sun4v_asm.o pci_fire.o | 20 | pci_sun4v.o pci_sun4v_asm.o pci_fire.o |
21 | obj-$(CONFIG_PCI_MSI) += pci_msi.o | 21 | obj-$(CONFIG_PCI_MSI) += pci_msi.o |
22 | obj-$(CONFIG_SMP) += smp.o trampoline.o hvtramp.o | 22 | obj-$(CONFIG_SMP) += smp.o trampoline.o hvtramp.o |
23 | obj-$(CONFIG_SPARC32_COMPAT) += sys32.o sys_sparc32.o signal32.o | 23 | obj-$(CONFIG_COMPAT) += sys32.o sys_sparc32.o signal32.o |
24 | obj-$(CONFIG_MODULES) += module.o | 24 | obj-$(CONFIG_MODULES) += module.o |
25 | obj-$(CONFIG_US3_FREQ) += us3_cpufreq.o | 25 | obj-$(CONFIG_US3_FREQ) += us3_cpufreq.o |
26 | obj-$(CONFIG_US2E_FREQ) += us2e_cpufreq.o | 26 | obj-$(CONFIG_US2E_FREQ) += us2e_cpufreq.o |
27 | obj-$(CONFIG_KPROBES) += kprobes.o | 27 | obj-$(CONFIG_KPROBES) += kprobes.o |
28 | obj-$(CONFIG_SUN_LDOMS) += ldc.o vio.o viohs.o ds.o | 28 | obj-$(CONFIG_SUN_LDOMS) += ldc.o vio.o viohs.o ds.o |
29 | obj-$(CONFIG_AUDIT) += audit.o | 29 | obj-$(CONFIG_AUDIT) += audit.o |
30 | obj-$(CONFIG_AUDIT)$(CONFIG_SPARC32_COMPAT) += compat_audit.o | 30 | obj-$(CONFIG_AUDIT)$(CONFIG_COMPAT) += compat_audit.o |
31 | obj-y += $(obj-yy) | 31 | obj-y += $(obj-yy) |
diff --git a/arch/sparc64/kernel/audit.c b/arch/sparc64/kernel/audit.c index 24d7f4b4178a..8fff0ac63d56 100644 --- a/arch/sparc64/kernel/audit.c +++ b/arch/sparc64/kernel/audit.c | |||
@@ -30,7 +30,7 @@ static unsigned signal_class[] = { | |||
30 | 30 | ||
31 | int audit_classify_arch(int arch) | 31 | int audit_classify_arch(int arch) |
32 | { | 32 | { |
33 | #ifdef CONFIG_SPARC32_COMPAT | 33 | #ifdef CONFIG_COMPAT |
34 | if (arch == AUDIT_ARCH_SPARC) | 34 | if (arch == AUDIT_ARCH_SPARC) |
35 | return 1; | 35 | return 1; |
36 | #endif | 36 | #endif |
@@ -39,7 +39,7 @@ int audit_classify_arch(int arch) | |||
39 | 39 | ||
40 | int audit_classify_syscall(int abi, unsigned syscall) | 40 | int audit_classify_syscall(int abi, unsigned syscall) |
41 | { | 41 | { |
42 | #ifdef CONFIG_SPARC32_COMPAT | 42 | #ifdef CONFIG_COMPAT |
43 | extern int sparc32_classify_syscall(unsigned); | 43 | extern int sparc32_classify_syscall(unsigned); |
44 | if (abi == AUDIT_ARCH_SPARC) | 44 | if (abi == AUDIT_ARCH_SPARC) |
45 | return sparc32_classify_syscall(syscall); | 45 | return sparc32_classify_syscall(syscall); |
@@ -60,7 +60,7 @@ int audit_classify_syscall(int abi, unsigned syscall) | |||
60 | 60 | ||
61 | static int __init audit_classes_init(void) | 61 | static int __init audit_classes_init(void) |
62 | { | 62 | { |
63 | #ifdef CONFIG_SPARC32_COMPAT | 63 | #ifdef CONFIG_COMPAT |
64 | extern __u32 sparc32_dir_class[]; | 64 | extern __u32 sparc32_dir_class[]; |
65 | extern __u32 sparc32_write_class[]; | 65 | extern __u32 sparc32_write_class[]; |
66 | extern __u32 sparc32_read_class[]; | 66 | extern __u32 sparc32_read_class[]; |
diff --git a/arch/sparc64/kernel/signal.c b/arch/sparc64/kernel/signal.c index 77a3e8592cbc..6afa5ef536eb 100644 --- a/arch/sparc64/kernel/signal.c +++ b/arch/sparc64/kernel/signal.c | |||
@@ -8,7 +8,7 @@ | |||
8 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 8 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #ifdef CONFIG_SPARC32_COMPAT | 11 | #ifdef CONFIG_COMPAT |
12 | #include <linux/compat.h> /* for compat_old_sigset_t */ | 12 | #include <linux/compat.h> /* for compat_old_sigset_t */ |
13 | #endif | 13 | #endif |
14 | #include <linux/sched.h> | 14 | #include <linux/sched.h> |
@@ -531,7 +531,7 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0) | |||
531 | else | 531 | else |
532 | oldset = ¤t->blocked; | 532 | oldset = ¤t->blocked; |
533 | 533 | ||
534 | #ifdef CONFIG_SPARC32_COMPAT | 534 | #ifdef CONFIG_COMPAT |
535 | if (test_thread_flag(TIF_32BIT)) { | 535 | if (test_thread_flag(TIF_32BIT)) { |
536 | extern void do_signal32(sigset_t *, struct pt_regs *, | 536 | extern void do_signal32(sigset_t *, struct pt_regs *, |
537 | struct signal_deliver_cookie *); | 537 | struct signal_deliver_cookie *); |