Commit e270b51d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: (23 commits)
  sparc: sunzilog uart order
  [SPARC64]: Detect trap frames in stack backtraces.
  [SPARC64]: %l6 trap return handling no longer necessary.
  [SPARC64]: Use trap type stored in pt_regs to handle syscall restart.
  [SPARC64]: Store magic cookie and trap type in pt_regs.
  [SPARC64]: PROM debug console can be CON_ANYTIME.
  sparc64: cleanup after SunOS/Solaris binary emulation removal
  sparc: cleanup after SunOS binary emulation removal
  [SPARC64]: Add NUMA support.
  [SPARC64]: Allocate TSB node-local.
  [SPARC64]: NUMA device infrastructure.
  [SPARC64]: Kill pci_iommu_table_init() declaration.
  [SPARC64]: Once we have the boot cmdline, call parse_early_param()
  [SPARC64]: Remove unused asm-sparc64/numnodes.h
  [SPARC64]: Decrease SECTION_SIZE_BITS to 30.
  [SPARC64]: Initialize MDESC earlier and use lmb_alloc()
  [SPARC64]: Use lmb_alloc() for PROM device tree.
  [SPARC64]: Call real_setup_per_cpu_areas() earlier and use lmb_alloc().
  [SPARC64]: Fully use LMB information in bootmem_init().
  [SPARC64]: Start using LMB information in bootmem_init().
  ...
parents 8fa82790 227739bf

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 25

EXTRAVERSION =

EXTRAVERSION = -numa

NAME = Funky Weasel is Jiggy wit it



# *DOCUMENTATION*

arch/sparc/kernel/entry.S

+0 −1
Original line number Diff line number Diff line
@@ -1409,7 +1409,6 @@ syscall_is_too_hard: 


	st	%o0, [%sp + STACKFRAME_SZ + PT_I0]



	.globl	ret_sys_call

ret_sys_call:

	ld	[%curptr + TI_FLAGS], %l6

	cmp	%o0, -ERESTART_RESTARTBLOCK

arch/sparc/kernel/signal.c

+0 −5
Original line number Diff line number Diff line
@@ -105,11 +105,6 @@ static int _sigpause_common(old_sigset_t set) 
	return -ERESTARTNOHAND;

}



asmlinkage int sys_sigpause(unsigned int set)

{

	return _sigpause_common(set);

}



asmlinkage int sys_sigsuspend(old_sigset_t set)

{

	return _sigpause_common(set);

arch/sparc64/Kconfig

+20 −0
Original line number Diff line number Diff line
@@ -250,6 +250,26 @@ endchoice 


endmenu



config NUMA

	bool "NUMA support"



config NODES_SHIFT

	int

	default "4"

	depends on NEED_MULTIPLE_NODES



# Some NUMA nodes have memory ranges that span

# other nodes.  Even though a pfn is valid and

# between a node's start and end pfns, it may not

# reside on that node.  See memmap_init_zone()

# for details.

config NODES_SPAN_OTHER_NODES

	def_bool y

	depends on NEED_MULTIPLE_NODES



config ARCH_POPULATES_NODE_MAP

	def_bool y



config ARCH_SELECT_MEMORY_MODEL

	def_bool y

arch/sparc64/defconfig

+64 −35
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.25

# Sun Apr 20 01:33:21 2008

# Linux kernel version: 2.6.25-numa

# Wed Apr 23 04:49:08 2008

#

CONFIG_SPARC=y

CONFIG_SPARC64=y
@@ -152,6 +152,8 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y 
CONFIG_HUGETLB_PAGE_SIZE_4MB=y

# CONFIG_HUGETLB_PAGE_SIZE_512K is not set

# CONFIG_HUGETLB_PAGE_SIZE_64K is not set

# CONFIG_NUMA is not set

CONFIG_ARCH_POPULATES_NODE_MAP=y

CONFIG_ARCH_SELECT_MEMORY_MODEL=y

CONFIG_ARCH_SPARSEMEM_ENABLE=y

CONFIG_ARCH_SPARSEMEM_DEFAULT=y
@@ -787,7 +789,6 @@ CONFIG_I2C_ALGOBIT=y 
# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_PCF8575 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_TPS65010 is not set

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_I2C_DEBUG_CORE is not set
@@ -869,6 +870,7 @@ CONFIG_SSB_POSSIBLE=y 
# Multifunction device drivers

#

# CONFIG_MFD_SM501 is not set

# CONFIG_HTC_PASIC3 is not set



#

# Multimedia devices
@@ -1219,10 +1221,6 @@ CONFIG_USB_STORAGE=m 
# CONFIG_NEW_LEDS is not set

# CONFIG_INFINIBAND is not set

# CONFIG_RTC_CLASS is not set



#

# Userspace I/O

#

# CONFIG_UIO is not set



#
@@ -1399,6 +1397,7 @@ CONFIG_SCHEDSTATS=y 
CONFIG_DEBUG_BUGVERBOSE=y

# CONFIG_DEBUG_INFO is not set

# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_WRITECOUNT is not set

# CONFIG_DEBUG_LIST is not set

# CONFIG_DEBUG_SG is not set

# CONFIG_BOOT_PRINTK_DELAY is not set
@@ -1425,53 +1424,82 @@ CONFIG_ASYNC_CORE=m 
CONFIG_ASYNC_MEMCPY=m

CONFIG_ASYNC_XOR=m

CONFIG_CRYPTO=y



#

# Crypto core or helper

#

CONFIG_CRYPTO_ALGAPI=y

CONFIG_CRYPTO_AEAD=y

CONFIG_CRYPTO_BLKCIPHER=y

# CONFIG_CRYPTO_SEQIV is not set

CONFIG_CRYPTO_HASH=y

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_GF128MUL=m

CONFIG_CRYPTO_NULL=m

# CONFIG_CRYPTO_CRYPTD is not set

CONFIG_CRYPTO_AUTHENC=y

CONFIG_CRYPTO_TEST=m



#

# Authenticated Encryption with Associated Data

#

# CONFIG_CRYPTO_CCM is not set

# CONFIG_CRYPTO_GCM is not set

# CONFIG_CRYPTO_SEQIV is not set



#

# Block modes

#

CONFIG_CRYPTO_CBC=y

# CONFIG_CRYPTO_CTR is not set

# CONFIG_CRYPTO_CTS is not set

CONFIG_CRYPTO_ECB=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m



#

# Hash modes

#

CONFIG_CRYPTO_HMAC=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_NULL=m



#

# Digest

#

CONFIG_CRYPTO_CRC32C=m

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_MD5=y

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_SHA1=y

CONFIG_CRYPTO_SHA256=m

CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_GF128MUL=m

CONFIG_CRYPTO_ECB=m

CONFIG_CRYPTO_CBC=y

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_XTS=m

# CONFIG_CRYPTO_CTR is not set

# CONFIG_CRYPTO_GCM is not set

# CONFIG_CRYPTO_CCM is not set

# CONFIG_CRYPTO_CRYPTD is not set

CONFIG_CRYPTO_DES=y

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_TWOFISH_COMMON=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_WP512=m



#

# Ciphers

#

CONFIG_CRYPTO_AES=m

CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_ARC4=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_ARC4=m

CONFIG_CRYPTO_DES=y

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_SEED=m

# CONFIG_CRYPTO_SALSA20 is not set

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_TWOFISH_COMMON=m



#

# Compression

#

CONFIG_CRYPTO_DEFLATE=y

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_CRC32C=m

CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_AUTHENC=y

# CONFIG_CRYPTO_LZO is not set

CONFIG_CRYPTO_HW=y

# CONFIG_CRYPTO_DEV_HIFN_795X is not set
@@ -1492,3 +1520,4 @@ CONFIG_PLIST=y 
CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOPORT=y

CONFIG_HAS_DMA=y

CONFIG_HAVE_LMB=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE