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

Commit 7a1fcd5f 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: (30 commits)
  sparc: Fix minor SPARC32 compile error
  sparc: Remove reg*.h from Kbuild
  sparc: Clean arch-specific code in prom_common.c
  sparc: Kill asm/reg*.h
  sparc: Use 64BIT config entry
  MAINTAINERS: update sparc maintainer
  sparc: unify ipcbuf.h
  sparc: Update 64-bit defconfig.
  sparc: remove NO_PROC_ID - it is no longer used
  sparc: drop get_tbr() in traps.h
  sparc: fix warning in userspace header traps.h
  sparc: fix warnings in userspace header byteorder.h
  sparc: fix warning in userspace header jsflash.h
  sparc: unify openprom.h
  sparc64: delete unused linux_prom64_ranges from openprom_64.h
  sparc: prepare openprom for unification
  sparc: remove linux_prom_pci_assigned_addresses from openprom_32.h
  sparc: remove ebus definitions from openprom*.h
  sparc: unify siginfo.h
  sparc: unify ptrace.h
  ...
parents 15b06690 4696b64d

MAINTAINERS

+5 −10
Original line number Diff line number Diff line
@@ -4015,10 +4015,12 @@ L: alsa-devel@alsa-project.org (subscribers-only) 
W:	http://alsa-project.org/main/index.php/ASoC

S:	Supported



SPARC (sparc32)

P:	William L. Irwin

M:	wli@holomorphy.com

SPARC + UltraSPARC (sparc/sparc64)

P:	David S. Miller

M:	davem@davemloft.net

L:	sparclinux@vger.kernel.org

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

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

S:	Maintained



SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER
@@ -4302,13 +4304,6 @@ M: dushistov@mail.ru 
L:	linux-kernel@vger.kernel.org

S:	Maintained



UltraSPARC (sparc64)

P:	David S. Miller

M:	davem@davemloft.net

L:	sparclinux@vger.kernel.org

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

S:	Maintained



ULTRA-WIDEBAND (UWB) SUBSYSTEM:

P:	David Vrabel

M:	david.vrabel@csr.com

arch/sparc/Kconfig

+13 −44
Original line number Diff line number Diff line
@@ -4,6 +4,17 @@ 


mainmenu "Linux/SPARC Kernel Configuration"



config 64BIT

	bool "64-bit kernel" if ARCH = "sparc"

	default ARCH = "sparc64"

	help

	  SPARC is a family of RISC microprocessors designed and marketed by

	  Sun Microsystems, incorporated.  They are very widely found in Sun

	  workstations and clones.



	  Say yes to build a 64-bit kernel - formerly known as sparc64

	  Say no to build a 32-bit kernel - formerly known as sparc



config SPARC

	bool

	default y
@@ -15,22 +26,11 @@ config SPARC 
	select RTC_CLASS

	select RTC_DRV_M48T59



# Identify this as a Sparc32 build

config SPARC32

	bool

	default y if ARCH = "sparc"

	help

	  SPARC is a family of RISC microprocessors designed and marketed by

	  Sun Microsystems, incorporated.  They are very widely found in Sun

	  workstations and clones. This port covers the original 32-bit SPARC;

	  it is old and stable and usually considered one of the "big three"

	  along with the Intel and Alpha ports.  The UltraLinux project

	  maintains both the SPARC32 and SPARC64 ports; its web page is

	  available at <http://www.ultralinux.org/>.

	def_bool !64BIT



config SPARC64

	bool

	default y if ARCH = "sparc64"

	def_bool 64BIT

	select ARCH_SUPPORTS_MSI

	select HAVE_FUNCTION_TRACER

	select HAVE_KRETPROBES
@@ -53,9 +53,6 @@ config BITS 
	default 32 if SPARC32

	default 64 if SPARC64



config 64BIT

	def_bool y if SPARC64



config GENERIC_TIME

	bool

	default y if SPARC64
@@ -188,14 +185,6 @@ config ARCH_MAY_HAVE_PC_FDC 
	bool

	default y



config ARCH_HAS_ILOG2_U32

	bool

	default n



config ARCH_HAS_ILOG2_U64

	bool

	default n



config EMULATED_CMPXCHG

	bool

	default y if SPARC32
@@ -442,26 +431,6 @@ config SERIAL_CONSOLE 
endmenu



menu "Bus options (PCI etc.)"

config ISA

	bool

	help

	  ISA is found on Espresso only and is not supported currently.



config ISAPNP

	bool

	help

	  ISAPNP is not supported



config EISA

	bool

	help

	  EISA is not supported.



config MCA

	bool

	help

	  MCA is not supported.



config SBUS

	bool

	default y

arch/sparc/configs/sparc64_defconfig

+72 −33
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.28-rc4

# Mon Nov 10 12:35:09 2008

# Linux kernel version: 2.6.28

# Fri Jan  2 18:14:26 2009

#

CONFIG_SPARC=y

CONFIG_SPARC64=y

CONFIG_ARCH_DEFCONFIG="arch/sparc/configs/sparc64_defconfig"

CONFIG_BITS=64

CONFIG_64BIT=y

CONFIG_GENERIC_TIME=y

CONFIG_GENERIC_CMOS_UPDATE=y

CONFIG_GENERIC_CLOCKEVENTS=y

CONFIG_64BIT=y

CONFIG_MMU=y

CONFIG_IOMMU_HELPER=y

CONFIG_QUICKLIST=y

CONFIG_STACKTRACE_SUPPORT=y

CONFIG_LOCKDEP_SUPPORT=y

CONFIG_ARCH_MAY_HAVE_PC_FDC=y

# CONFIG_ARCH_HAS_ILOG2_U32 is not set

# CONFIG_ARCH_HAS_ILOG2_U64 is not set

CONFIG_HAVE_LATENCYTOP_SUPPORT=y

CONFIG_AUDIT_ARCH=y

CONFIG_HAVE_SETUP_PER_CPU_AREA=y

CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y

CONFIG_MMU=y

CONFIG_ARCH_NO_VIRT_TO_BUS=y

CONFIG_OF=y

CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"



#
@@ -86,6 +86,7 @@ CONFIG_SLUB_DEBUG=y 
CONFIG_SLUB=y

# CONFIG_SLOB is not set

CONFIG_PROFILING=y

CONFIG_TRACEPOINTS=y

# CONFIG_MARKERS is not set

CONFIG_OPROFILE=m

CONFIG_HAVE_OPROFILE=y
@@ -127,34 +128,40 @@ CONFIG_DEFAULT_AS=y 
# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="anticipatory"

CONFIG_CLASSIC_RCU=y

# CONFIG_TREE_RCU is not set

# CONFIG_PREEMPT_RCU is not set

# CONFIG_TREE_RCU_TRACE is not set

# CONFIG_PREEMPT_RCU_TRACE is not set

# CONFIG_FREEZER is not set



#

# Processor type and features

#

CONFIG_SPARC64_PAGE_SIZE_8KB=y

# CONFIG_SPARC64_PAGE_SIZE_64KB is not set

CONFIG_SECCOMP=y

CONFIG_SMP=y

CONFIG_NR_CPUS=64

CONFIG_HZ_100=y

# CONFIG_HZ_250 is not set

# CONFIG_HZ_300 is not set

# CONFIG_HZ_1000 is not set

CONFIG_HZ=100

CONFIG_SCHED_HRTICK=y

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

CONFIG_GENERIC_FIND_NEXT_BIT=y

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_ARCH_MAY_HAVE_PC_FDC=y

CONFIG_SPARC64_SMP=y

CONFIG_SPARC64_PAGE_SIZE_8KB=y

# CONFIG_SPARC64_PAGE_SIZE_64KB is not set

CONFIG_SECCOMP=y

CONFIG_HOTPLUG_CPU=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_TICK_ONESHOT=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_GENERIC_CLOCKEVENTS_BUILD=y

CONFIG_SMP=y

CONFIG_NR_CPUS=64

# CONFIG_CPU_FREQ is not set

CONFIG_US3_MC=y

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

CONFIG_GENERIC_FIND_NEXT_BIT=y

CONFIG_GENERIC_HWEIGHT=y

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
@@ -183,10 +190,18 @@ CONFIG_PHYS_ADDR_T_64BIT=y 
CONFIG_ZONE_DMA_FLAG=0

CONFIG_NR_QUICK=1

CONFIG_UNEVICTABLE_LRU=y

CONFIG_SCHED_SMT=y

CONFIG_SCHED_MC=y

# CONFIG_PREEMPT_NONE is not set

CONFIG_PREEMPT_VOLUNTARY=y

# CONFIG_PREEMPT is not set

# CONFIG_CMDLINE_BOOL is not set



#

# Bus options (PCI etc.)

#

CONFIG_SBUS=y

CONFIG_SBUSCHAR=y

CONFIG_SUN_AUXIO=y

CONFIG_SUN_IO=y

CONFIG_SUN_LDOMS=y

CONFIG_PCI=y

CONFIG_PCI_DOMAINS=y
@@ -195,7 +210,9 @@ CONFIG_ARCH_SUPPORTS_MSI=y 
CONFIG_PCI_MSI=y

# CONFIG_PCI_LEGACY is not set

# CONFIG_PCI_DEBUG is not set

# CONFIG_PCCARD is not set

CONFIG_SUN_OPENPROMFS=m

CONFIG_SPARC64_PCI=y



#

# Executable file formats
@@ -207,17 +224,13 @@ CONFIG_COMPAT_BINFMT_ELF=y 
CONFIG_BINFMT_MISC=m

CONFIG_COMPAT=y

CONFIG_SYSVIPC_COMPAT=y

CONFIG_SCHED_SMT=y

CONFIG_SCHED_MC=y

# CONFIG_PREEMPT_NONE is not set

CONFIG_PREEMPT_VOLUNTARY=y

# CONFIG_PREEMPT is not set

# CONFIG_CMDLINE_BOOL is not set

CONFIG_NET=y



#

# Networking options

#

# CONFIG_NET_NS is not set

CONFIG_COMPAT_NET_DEV_OPS=y

CONFIG_PACKET=y

CONFIG_PACKET_MMAP=y

CONFIG_UNIX=y
@@ -314,6 +327,7 @@ CONFIG_VLAN_8021Q=m 
# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set

# CONFIG_NET_SCHED is not set

# CONFIG_DCB is not set



#

# Network testing
@@ -330,8 +344,8 @@ CONFIG_WIRELESS=y 
# CONFIG_CFG80211 is not set

CONFIG_WIRELESS_OLD_REGULATORY=y

# CONFIG_WIRELESS_EXT is not set

# CONFIG_LIB80211 is not set

# CONFIG_MAC80211 is not set

# CONFIG_IEEE80211 is not set

# CONFIG_RFKILL is not set

# CONFIG_NET_9P is not set
@@ -378,8 +392,10 @@ CONFIG_MISC_DEVICES=y 
# CONFIG_EEPROM_93CX6 is not set

# CONFIG_SGI_IOC4 is not set

# CONFIG_TIFM_CORE is not set

# CONFIG_ICS932S401 is not set

# CONFIG_ENCLOSURE_SERVICES is not set

# CONFIG_HP_ILO is not set

# CONFIG_C2PORT is not set

CONFIG_HAVE_IDE=y

CONFIG_IDE=y
@@ -387,6 +403,7 @@ CONFIG_IDE=y 
# Please see Documentation/ide/ide.txt for help/info on IDE drives

#

CONFIG_IDE_TIMINGS=y

CONFIG_IDE_ATAPI=y

# CONFIG_BLK_DEV_IDE_SATA is not set

CONFIG_IDE_GD=y

CONFIG_IDE_GD_ATA=y
@@ -394,7 +411,6 @@ CONFIG_IDE_GD_ATA=y 
CONFIG_BLK_DEV_IDECD=y

CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y

# CONFIG_BLK_DEV_IDETAPE is not set

# CONFIG_BLK_DEV_IDESCSI is not set

# CONFIG_IDE_TASK_IOCTL is not set

CONFIG_IDE_PROC_FS=y
@@ -477,6 +493,7 @@ CONFIG_SCSI_FC_ATTRS=y 
# CONFIG_SCSI_SRP_ATTRS is not set

CONFIG_SCSI_LOWLEVEL=y

# CONFIG_ISCSI_TCP is not set

# CONFIG_SCSI_CXGB3_ISCSI is not set

# CONFIG_BLK_DEV_3W_XXXX_RAID is not set

# CONFIG_SCSI_3W_9XXX is not set

# CONFIG_SCSI_ACARD is not set
@@ -490,6 +507,8 @@ CONFIG_SCSI_LOWLEVEL=y 
# CONFIG_MEGARAID_LEGACY is not set

# CONFIG_MEGARAID_SAS is not set

# CONFIG_SCSI_HPTIOP is not set

# CONFIG_LIBFC is not set

# CONFIG_FCOE is not set

# CONFIG_SCSI_DMX3191D is not set

# CONFIG_SCSI_FUTURE_DOMAIN is not set

# CONFIG_SCSI_IPS is not set
@@ -564,6 +583,9 @@ CONFIG_PHYLIB=m 
# CONFIG_BROADCOM_PHY is not set

# CONFIG_ICPLUS_PHY is not set

# CONFIG_REALTEK_PHY is not set

# CONFIG_NATIONAL_PHY is not set

# CONFIG_STE10XP is not set

# CONFIG_LSI_ET1011C_PHY is not set

# CONFIG_MDIO_BITBANG is not set

CONFIG_NET_ETHERNET=y

CONFIG_MII=m
@@ -590,7 +612,6 @@ CONFIG_NET_PCI=y 
# CONFIG_ADAPTEC_STARFIRE is not set

# CONFIG_B44 is not set

# CONFIG_FORCEDETH is not set

# CONFIG_EEPRO100 is not set

# CONFIG_E100 is not set

# CONFIG_FEALNX is not set

# CONFIG_NATSEMI is not set
@@ -600,6 +621,7 @@ CONFIG_NET_PCI=y 
# CONFIG_R6040 is not set

# CONFIG_SIS900 is not set

# CONFIG_EPIC100 is not set

# CONFIG_SMSC9420 is not set

# CONFIG_SUNDANCE is not set

# CONFIG_TLAN is not set

# CONFIG_VIA_RHINE is not set
@@ -629,6 +651,7 @@ CONFIG_BNX2=m 
# CONFIG_JME is not set

CONFIG_NETDEV_10000=y

# CONFIG_CHELSIO_T1 is not set

CONFIG_CHELSIO_T3_DEPENDS=y

# CONFIG_CHELSIO_T3 is not set

# CONFIG_ENIC is not set

# CONFIG_IXGBE is not set
@@ -778,6 +801,7 @@ CONFIG_SERIAL_CORE=y 
CONFIG_SERIAL_CORE_CONSOLE=y

# CONFIG_SERIAL_JSM is not set

CONFIG_UNIX98_PTYS=y

# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set

# CONFIG_LEGACY_PTYS is not set

# CONFIG_IPMI_HANDLER is not set

CONFIG_HW_RANDOM=m
@@ -870,6 +894,7 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_ADM1029 is not set

# CONFIG_SENSORS_ADM1031 is not set

# CONFIG_SENSORS_ADM9240 is not set

# CONFIG_SENSORS_ADT7462 is not set

# CONFIG_SENSORS_ADT7470 is not set

# CONFIG_SENSORS_ADT7473 is not set

# CONFIG_SENSORS_ATXP1 is not set
@@ -919,11 +944,11 @@ CONFIG_HWMON=y 
# CONFIG_THERMAL is not set

# CONFIG_THERMAL_HWMON is not set

# CONFIG_WATCHDOG is not set

CONFIG_SSB_POSSIBLE=y



#

# Sonics Silicon Backplane

#

CONFIG_SSB_POSSIBLE=y

# CONFIG_SSB is not set



#
@@ -1071,6 +1096,7 @@ CONFIG_SND_MIXER_OSS=m 
CONFIG_SND_PCM_OSS=m

CONFIG_SND_PCM_OSS_PLUGINS=y

CONFIG_SND_SEQUENCER_OSS=y

# CONFIG_SND_HRTIMER is not set

# CONFIG_SND_DYNAMIC_MINORS is not set

CONFIG_SND_SUPPORT_OLD_API=y

CONFIG_SND_VERBOSE_PROCFS=y
@@ -1242,11 +1268,11 @@ CONFIG_USB_UHCI_HCD=m 
# CONFIG_USB_TMC is not set



#

# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'

# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;

#



#

# may also be needed; see USB_STORAGE Help for more information

# see USB_STORAGE Help for more information

#

CONFIG_USB_STORAGE=m

# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1337,6 +1363,7 @@ CONFIG_RTC_INTF_DEV=y 
# CONFIG_RTC_DRV_M41T80 is not set

# CONFIG_RTC_DRV_S35390A is not set

# CONFIG_RTC_DRV_FM3130 is not set

# CONFIG_RTC_DRV_RX8581 is not set



#

# SPI RTC drivers
@@ -1365,7 +1392,6 @@ CONFIG_RTC_DRV_STARFIRE=y 
# CONFIG_DMADEVICES is not set

# CONFIG_UIO is not set

# CONFIG_STAGING is not set

CONFIG_STAGING_EXCLUDE_BUILD=y



#

# Misc Linux/SPARC drivers
@@ -1544,6 +1570,7 @@ CONFIG_SCHEDSTATS=y 
# CONFIG_LOCK_STAT is not set

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set

CONFIG_STACKTRACE=y

# CONFIG_DEBUG_KOBJECT is not set

CONFIG_DEBUG_BUGVERBOSE=y

# CONFIG_DEBUG_INFO is not set
@@ -1552,6 +1579,7 @@ CONFIG_DEBUG_BUGVERBOSE=y 
CONFIG_DEBUG_MEMORY_INIT=y

# CONFIG_DEBUG_LIST is not set

# CONFIG_DEBUG_SG is not set

# CONFIG_DEBUG_NOTIFIERS is not set

# CONFIG_BOOT_PRINTK_DELAY is not set

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1560,8 +1588,12 @@ CONFIG_DEBUG_MEMORY_INIT=y 
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set

# CONFIG_LKDTM is not set

# CONFIG_FAULT_INJECTION is not set

# CONFIG_LATENCYTOP is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_NOP_TRACER=y

CONFIG_HAVE_FUNCTION_TRACER=y

CONFIG_RING_BUFFER=y

CONFIG_TRACING=y



#

# Tracers
@@ -1571,7 +1603,9 @@ CONFIG_HAVE_FUNCTION_TRACER=y 
# CONFIG_SCHED_TRACER is not set

# CONFIG_CONTEXT_SWITCH_TRACER is not set

# CONFIG_BOOT_TRACER is not set

# CONFIG_TRACE_BRANCH_PROFILING is not set

# CONFIG_STACK_TRACER is not set

# CONFIG_FTRACE_STARTUP_TEST is not set

# CONFIG_DYNAMIC_PRINTK_DEBUG is not set

# CONFIG_SAMPLES is not set

CONFIG_HAVE_ARCH_KGDB=y
@@ -1600,11 +1634,16 @@ CONFIG_CRYPTO=y 
#

# CONFIG_CRYPTO_FIPS is not set

CONFIG_CRYPTO_ALGAPI=y

CONFIG_CRYPTO_ALGAPI2=y

CONFIG_CRYPTO_AEAD=y

CONFIG_CRYPTO_AEAD2=y

CONFIG_CRYPTO_BLKCIPHER=y

CONFIG_CRYPTO_BLKCIPHER2=y

CONFIG_CRYPTO_HASH=y

CONFIG_CRYPTO_RNG=y

CONFIG_CRYPTO_HASH2=y

CONFIG_CRYPTO_RNG2=y

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_MANAGER2=y

CONFIG_CRYPTO_GF128MUL=m

CONFIG_CRYPTO_NULL=m

# CONFIG_CRYPTO_CRYPTD is not set

arch/sparc/include/asm/Kbuild

+0 −20
Original line number Diff line number Diff line 
# User exported sparc header files

include include/asm-generic/Kbuild.asm



header-y += ipcbuf_32.h

header-y += ipcbuf_64.h

header-y += posix_types_32.h

header-y += posix_types_64.h

header-y += ptrace_32.h

header-y += ptrace_64.h

header-y += sigcontext_32.h

header-y += sigcontext_64.h

header-y += siginfo_32.h

header-y += siginfo_64.h

header-y += signal_32.h

header-y += signal_64.h

header-y += stat_32.h

header-y += stat_64.h



header-y += apc.h

header-y += asi.h

header-y += display7seg.h
@@ -23,16 +8,11 @@ header-y += envctrl.h 
header-y += fbio.h

header-y += jsflash.h

header-y += openprom.h

header-y += openprom_32.h

header-y += openprom_64.h

header-y += openpromio.h

header-y += perfctr.h

header-y += psrcompat.h

header-y += psr.h

header-y += pstate.h

header-y += reg.h

header-y += reg_32.h

header-y += reg_64.h

header-y += traps.h

header-y += uctx.h

header-y += utrap.h

arch/sparc/include/asm/byteorder.h

+5 −7
Original line number Diff line number Diff line 
#ifndef _SPARC_BYTEORDER_H

#define _SPARC_BYTEORDER_H



#include <asm/types.h>

#include <linux/types.h>

#include <asm/asi.h>



#define __BIG_ENDIAN



#ifdef CONFIG_SPARC32

#define __SWAB_64_THRU_32__

#endif



#ifdef CONFIG_SPARC64

#if defined(__sparc__) && defined(__arch64__)

static inline __u16 __arch_swab16p(const __u16 *addr)

{

	__u16 ret;
@@ -44,7 +40,9 @@ static inline __u64 __arch_swab64p(const __u64 *addr) 
}

#define __arch_swab64p __arch_swab64p



#endif /* CONFIG_SPARC64 */

#else

#define __SWAB_64_THRU_32__

#endif /* defined(__sparc__) && defined(__arch64__) */



#include <linux/byteorder.h>