Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09337f50 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parent 05d515ef

arch/sparc64/Kconfig

+0 −7
Original line number Original line Diff line number Diff line
@@ -348,15 +348,8 @@ menu "Executable file formats" 




source "fs/Kconfig.binfmt"

source "fs/Kconfig.binfmt"





config SPARC32_COMPAT

	bool "Kernel support for 32-bit SPARC binary compatibility"

	help

	  This allows you to run 32-bit binaries on your 64-bit SPARC system.

	  Everybody wants this; say Y.



config COMPAT

config COMPAT

	bool

	bool

	depends on SPARC32_COMPAT

	default y

	default y

	select COMPAT_BINFMT_ELF

	select COMPAT_BINFMT_ELF

arch/sparc64/defconfig

+9 −14
Original line number Original line Diff line number Diff line 
#

#

# Automatically generated make config: don't edit

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.25-numa

# Linux kernel version: 2.6.25

# Wed Apr 23 04:49:08 2008

# Sat Apr 26 03:11:06 2008

#

#

CONFIG_SPARC=y

CONFIG_SPARC=y

CONFIG_SPARC64=y

CONFIG_SPARC64=y
@@ -152,7 +152,9 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y 
CONFIG_HUGETLB_PAGE_SIZE_4MB=y

CONFIG_HUGETLB_PAGE_SIZE_4MB=y

# CONFIG_HUGETLB_PAGE_SIZE_512K is not set

# CONFIG_HUGETLB_PAGE_SIZE_512K is not set

# CONFIG_HUGETLB_PAGE_SIZE_64K is not set

# CONFIG_HUGETLB_PAGE_SIZE_64K is not set

# CONFIG_NUMA is not set

CONFIG_NUMA=y

CONFIG_NODES_SHIFT=4

CONFIG_NODES_SPAN_OTHER_NODES=y

CONFIG_ARCH_POPULATES_NODE_MAP=y

CONFIG_ARCH_POPULATES_NODE_MAP=y

CONFIG_ARCH_SELECT_MEMORY_MODEL=y

CONFIG_ARCH_SELECT_MEMORY_MODEL=y

CONFIG_ARCH_SPARSEMEM_ENABLE=y

CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -162,12 +164,14 @@ CONFIG_SELECT_MEMORY_MODEL=y 
# CONFIG_DISCONTIGMEM_MANUAL is not set

# CONFIG_DISCONTIGMEM_MANUAL is not set

CONFIG_SPARSEMEM_MANUAL=y

CONFIG_SPARSEMEM_MANUAL=y

CONFIG_SPARSEMEM=y

CONFIG_SPARSEMEM=y

CONFIG_NEED_MULTIPLE_NODES=y

CONFIG_HAVE_MEMORY_PRESENT=y

CONFIG_HAVE_MEMORY_PRESENT=y

# CONFIG_SPARSEMEM_STATIC is not set

# CONFIG_SPARSEMEM_STATIC is not set

CONFIG_SPARSEMEM_EXTREME=y

CONFIG_SPARSEMEM_EXTREME=y

CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y

CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y

CONFIG_SPARSEMEM_VMEMMAP=y

CONFIG_SPARSEMEM_VMEMMAP=y

CONFIG_SPLIT_PTLOCK_CPUS=4

CONFIG_SPLIT_PTLOCK_CPUS=4

CONFIG_MIGRATION=y

CONFIG_RESOURCES_64BIT=y

CONFIG_RESOURCES_64BIT=y

CONFIG_ZONE_DMA_FLAG=0

CONFIG_ZONE_DMA_FLAG=0

CONFIG_NR_QUICK=1

CONFIG_NR_QUICK=1
@@ -191,7 +195,6 @@ CONFIG_SUN_OPENPROMFS=m 
CONFIG_BINFMT_ELF=y

CONFIG_BINFMT_ELF=y

CONFIG_COMPAT_BINFMT_ELF=y

CONFIG_COMPAT_BINFMT_ELF=y

CONFIG_BINFMT_MISC=m

CONFIG_BINFMT_MISC=m

CONFIG_SPARC32_COMPAT=y

CONFIG_COMPAT=y

CONFIG_COMPAT=y

CONFIG_SYSVIPC_COMPAT=y

CONFIG_SYSVIPC_COMPAT=y

CONFIG_SCHED_SMT=y

CONFIG_SCHED_SMT=y
@@ -746,13 +749,7 @@ CONFIG_DEVPORT=y 
CONFIG_I2C=y

CONFIG_I2C=y

CONFIG_I2C_BOARDINFO=y

CONFIG_I2C_BOARDINFO=y

# CONFIG_I2C_CHARDEV is not set

# CONFIG_I2C_CHARDEV is not set



#

# I2C Algorithms

#

CONFIG_I2C_ALGOBIT=y

CONFIG_I2C_ALGOBIT=y

# CONFIG_I2C_ALGOPCF is not set

# CONFIG_I2C_ALGOPCA is not set





#

#

# I2C Hardware Bus support

# I2C Hardware Bus support
@@ -780,6 +777,7 @@ CONFIG_I2C_ALGOBIT=y 
# CONFIG_I2C_VIA is not set

# CONFIG_I2C_VIA is not set

# CONFIG_I2C_VIAPRO is not set

# CONFIG_I2C_VIAPRO is not set

# CONFIG_I2C_VOODOO3 is not set

# CONFIG_I2C_VOODOO3 is not set

# CONFIG_I2C_PCA_PLATFORM is not set





#

#

# Miscellaneous I2C Chip support

# Miscellaneous I2C Chip support
@@ -1026,6 +1024,7 @@ CONFIG_SND_ALI5451=m 
# CONFIG_SND_AU8810 is not set

# CONFIG_SND_AU8810 is not set

# CONFIG_SND_AU8820 is not set

# CONFIG_SND_AU8820 is not set

# CONFIG_SND_AU8830 is not set

# CONFIG_SND_AU8830 is not set

# CONFIG_SND_AW2 is not set

# CONFIG_SND_AZT3328 is not set

# CONFIG_SND_AZT3328 is not set

# CONFIG_SND_BT87X is not set

# CONFIG_SND_BT87X is not set

# CONFIG_SND_CA0106 is not set

# CONFIG_SND_CA0106 is not set
@@ -1096,10 +1095,6 @@ CONFIG_SND_SUN_CS4231=m 
#

#

# CONFIG_SND_SOC is not set

# CONFIG_SND_SOC is not set





#

# SoC Audio support for SuperH

#



#

#

# ALSA SoC audio for Freescale SOCs

# ALSA SoC audio for Freescale SOCs

#

#

arch/sparc64/kernel/Makefile

+2 −2
Original line number Original line Diff line number Diff line
@@ -20,12 +20,12 @@ obj-$(CONFIG_PCI) += ebus.o isa.o pci_common.o \ 
			    pci_sun4v.o pci_sun4v_asm.o pci_fire.o

			    pci_sun4v.o pci_sun4v_asm.o pci_fire.o

obj-$(CONFIG_PCI_MSI)	+= pci_msi.o

obj-$(CONFIG_PCI_MSI)	+= pci_msi.o

obj-$(CONFIG_SMP)	 += smp.o trampoline.o hvtramp.o

obj-$(CONFIG_SMP)	 += smp.o trampoline.o hvtramp.o

obj-$(CONFIG_SPARC32_COMPAT) += sys32.o sys_sparc32.o signal32.o

obj-$(CONFIG_COMPAT) += sys32.o sys_sparc32.o signal32.o

obj-$(CONFIG_MODULES) += module.o

obj-$(CONFIG_MODULES) += module.o

obj-$(CONFIG_US3_FREQ) += us3_cpufreq.o

obj-$(CONFIG_US3_FREQ) += us3_cpufreq.o

obj-$(CONFIG_US2E_FREQ) += us2e_cpufreq.o

obj-$(CONFIG_US2E_FREQ) += us2e_cpufreq.o

obj-$(CONFIG_KPROBES) += kprobes.o

obj-$(CONFIG_KPROBES) += kprobes.o

obj-$(CONFIG_SUN_LDOMS) += ldc.o vio.o viohs.o ds.o

obj-$(CONFIG_SUN_LDOMS) += ldc.o vio.o viohs.o ds.o

obj-$(CONFIG_AUDIT) += audit.o

obj-$(CONFIG_AUDIT) += audit.o

obj-$(CONFIG_AUDIT)$(CONFIG_SPARC32_COMPAT) += compat_audit.o

obj-$(CONFIG_AUDIT)$(CONFIG_COMPAT) += compat_audit.o

obj-y += $(obj-yy)
 
obj-y += $(obj-yy)

arch/sparc64/kernel/audit.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ static unsigned signal_class[] = { 




int audit_classify_arch(int arch)

int audit_classify_arch(int arch)

{

{

#ifdef CONFIG_SPARC32_COMPAT

#ifdef CONFIG_COMPAT

	if (arch == AUDIT_ARCH_SPARC)

	if (arch == AUDIT_ARCH_SPARC)

		return 1;

		return 1;

#endif

#endif
@@ -39,7 +39,7 @@ int audit_classify_arch(int arch) 




int audit_classify_syscall(int abi, unsigned syscall)

int audit_classify_syscall(int abi, unsigned syscall)

{

{

#ifdef CONFIG_SPARC32_COMPAT

#ifdef CONFIG_COMPAT

	extern int sparc32_classify_syscall(unsigned);

	extern int sparc32_classify_syscall(unsigned);

	if (abi == AUDIT_ARCH_SPARC)

	if (abi == AUDIT_ARCH_SPARC)

		return sparc32_classify_syscall(syscall);

		return sparc32_classify_syscall(syscall);
@@ -60,7 +60,7 @@ int audit_classify_syscall(int abi, unsigned syscall) 




static int __init audit_classes_init(void)

static int __init audit_classes_init(void)

{

{

#ifdef CONFIG_SPARC32_COMPAT

#ifdef CONFIG_COMPAT

	extern __u32 sparc32_dir_class[];

	extern __u32 sparc32_dir_class[];

	extern __u32 sparc32_write_class[];

	extern __u32 sparc32_write_class[];

	extern __u32 sparc32_read_class[];

	extern __u32 sparc32_read_class[];

arch/sparc64/kernel/signal.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -8,7 +8,7 @@ 
 *  Copyright (C) 1997,1998 Jakub Jelinek   (jj@sunsite.mff.cuni.cz)

 *  Copyright (C) 1997,1998 Jakub Jelinek   (jj@sunsite.mff.cuni.cz)

 */

 */





#ifdef CONFIG_SPARC32_COMPAT

#ifdef CONFIG_COMPAT

#include <linux/compat.h>	/* for compat_old_sigset_t */

#include <linux/compat.h>	/* for compat_old_sigset_t */

#endif

#endif

#include <linux/sched.h>

#include <linux/sched.h>
@@ -531,7 +531,7 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0) 
	else

	else

		oldset = &current->blocked;

		oldset = &current->blocked;





#ifdef CONFIG_SPARC32_COMPAT

#ifdef CONFIG_COMPAT

	if (test_thread_flag(TIF_32BIT)) {

	if (test_thread_flag(TIF_32BIT)) {

		extern void do_signal32(sigset_t *, struct pt_regs *,

		extern void do_signal32(sigset_t *, struct pt_regs *,

					struct signal_deliver_cookie *);

					struct signal_deliver_cookie *);