Commit 65fc4713 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Update defconfig.
  [SPARC64]: Do not include compat.h from asm-sparc64/signal.h any more.
  [SPARC64]: Move signal compat bits to new header file.
parents ccaa36f7 94e45a2b

arch/sparc64/defconfig

+18 −5
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.18

# Tue Sep 26 23:09:35 2006

# Mon Oct  2 14:24:40 2006

#

CONFIG_SPARC=y

CONFIG_SPARC64=y
@@ -35,17 +35,20 @@ CONFIG_LOCALVERSION="" 
# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_SWAP=y

CONFIG_SYSVIPC=y

# CONFIG_IPC_NS is not set

CONFIG_POSIX_MQUEUE=y

# CONFIG_BSD_PROCESS_ACCT is not set

# CONFIG_TASKSTATS is not set

# CONFIG_UTS_NS is not set

# CONFIG_AUDIT is not set

# CONFIG_IKCONFIG is not set

CONFIG_RELAY=y

CONFIG_INITRAMFS_SOURCE=""

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_SYSCTL=y

# CONFIG_EMBEDDED is not set

CONFIG_UID16=y

CONFIG_SYSCTL=y

# CONFIG_SYSCTL_SYSCALL is not set

CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_ALL is not set

# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -77,6 +80,7 @@ CONFIG_KMOD=y 
#

# Block layer

#

CONFIG_BLOCK=y

CONFIG_BLK_DEV_IO_TRACE=y



#
@@ -154,7 +158,7 @@ CONFIG_BINFMT_ELF32=y 
#

CONFIG_BINFMT_ELF=y

CONFIG_BINFMT_MISC=m

# CONFIG_SOLARIS_EMUL is not set

CONFIG_SOLARIS_EMUL=y

# CONFIG_CMDLINE_BOOL is not set



#
@@ -622,6 +626,7 @@ CONFIG_BNX2=m 
# Input device support

#

CONFIG_INPUT=y

# CONFIG_INPUT_FF_MEMLESS is not set



#

# Userland interfaces
@@ -644,6 +649,7 @@ CONFIG_KEYBOARD_SUNKBD=y 
CONFIG_KEYBOARD_LKKBD=m

# CONFIG_KEYBOARD_XTKBD is not set

# CONFIG_KEYBOARD_NEWTON is not set

# CONFIG_KEYBOARD_STOWAWAY is not set

CONFIG_INPUT_MOUSE=y

CONFIG_MOUSE_PS2=y

CONFIG_MOUSE_SERIAL=y
@@ -821,6 +827,7 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_SMSC47M192 is not set

# CONFIG_SENSORS_SMSC47B397 is not set

# CONFIG_SENSORS_VIA686A is not set

# CONFIG_SENSORS_VT1211 is not set

# CONFIG_SENSORS_VT8231 is not set

# CONFIG_SENSORS_W83781D is not set

# CONFIG_SENSORS_W83791D is not set
@@ -1092,6 +1099,7 @@ CONFIG_USB_HIDDEV=y 
# CONFIG_USB_ATI_REMOTE2 is not set

# CONFIG_USB_KEYSPAN_REMOTE is not set

# CONFIG_USB_APPLETOUCH is not set

# CONFIG_USB_TRANCEVIBRATOR is not set



#

# USB Imaging devices
@@ -1123,6 +1131,7 @@ CONFIG_USB_HIDDEV=y 
#

# CONFIG_USB_EMI62 is not set

# CONFIG_USB_EMI26 is not set

# CONFIG_USB_ADUTUX is not set

# CONFIG_USB_AUERSWALD is not set

# CONFIG_USB_RIO500 is not set

# CONFIG_USB_LEGOTOWER is not set
@@ -1130,9 +1139,9 @@ CONFIG_USB_HIDDEV=y 
# CONFIG_USB_LED is not set

# CONFIG_USB_CYPRESS_CY7C63 is not set

# CONFIG_USB_CYTHERM is not set

# CONFIG_USB_PHIDGETKIT is not set

# CONFIG_USB_PHIDGETSERVO is not set

# CONFIG_USB_PHIDGET is not set

# CONFIG_USB_IDMOUSE is not set

# CONFIG_USB_FTDI_ELAN is not set

# CONFIG_USB_APPLEDISPLAY is not set

# CONFIG_USB_SISUSBVGA is not set

# CONFIG_USB_LD is not set
@@ -1256,8 +1265,10 @@ CONFIG_DNOTIFY=y 
#

CONFIG_PROC_FS=y

CONFIG_PROC_KCORE=y

CONFIG_PROC_SYSCTL=y

CONFIG_SYSFS=y

CONFIG_TMPFS=y

# CONFIG_TMPFS_POSIX_ACL is not set

CONFIG_HUGETLBFS=y

CONFIG_HUGETLB_PAGE=y

CONFIG_RAMFS=y
@@ -1374,9 +1385,11 @@ CONFIG_DEBUG_BUGVERBOSE=y 
# CONFIG_DEBUG_INFO is not set

CONFIG_DEBUG_FS=y

# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_LIST is not set

# CONFIG_UNWIND_INFO is not set

CONFIG_FORCED_INLINING=y

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_LKDTM is not set

# CONFIG_DEBUG_STACK_USAGE is not set

# CONFIG_DEBUG_DCFLUSH is not set

# CONFIG_STACK_DEBUG is not set

arch/sparc64/kernel/signal32.c

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <asm/psrcompat.h>

#include <asm/fpumacro.h>

#include <asm/visasm.h>

#include <asm/compat_signal.h>



#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))

arch/sparc64/kernel/sys_sparc32.c

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
#include <asm/semaphore.h>

#include <asm/mmu_context.h>

#include <asm/a.out.h>

#include <asm/compat_signal.h>



asmlinkage long sys32_chown16(const char __user * filename, u16 user, u16 group)

{

arch/sparc64/kernel/sys_sunos32.c

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <asm/idprom.h> /* for gethostid() */

#include <asm/unistd.h>

#include <asm/system.h>

#include <asm/compat_signal.h>



/* For the nfs mount emulation */

#include <linux/socket.h>

include/asm-sparc64/compat_signal.h

0 → 100644
+30 −0
Original line number Diff line number Diff line 
#ifndef _COMPAT_SIGNAL_H

#define _COMPAT_SIGNAL_H



#include <linux/config.h>

#include <linux/compat.h>

#include <asm/signal.h>



#ifdef CONFIG_COMPAT

struct __new_sigaction32 {

	unsigned		sa_handler;

	unsigned int    	sa_flags;

	unsigned		sa_restorer;     /* not used by Linux/SPARC yet */

	compat_sigset_t 	sa_mask;

};



struct __old_sigaction32 {

	unsigned		sa_handler;

	compat_old_sigset_t  	sa_mask;

	unsigned int    	sa_flags;

	unsigned		sa_restorer;     /* not used by Linux/SPARC yet */

};



typedef struct sigaltstack32 {

	u32			ss_sp;

	int			ss_flags;

	compat_size_t		ss_size;

} stack_t32;

#endif



#endif /* !(_COMPAT_SIGNAL_H) */

CRA Git | Maintained and supported by SUSTech CRA and CCSE