Commit 29e0937b 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.
  [VIDEO]: XVR-500 and XVR-2500 need FB=y.
  [SPARC32]: asm/system.h needs asm/smp.h
  [SPARC32]: Update defconfig.
  [SPARC32]: Fix sparc32 kdebug changes.
  [SPARC64]: Accept ebus_bus_type for generic DMA ops.
  [SPARC64]: Add missing cpus_empty() check in hypervisor xcall handling.
  [SCSI]: Add help text for SCSI_ESP_CORE.
  [SPARC] SBUS: display7seg.c needs asm/io.h
  [SPARC] SBUS: bbc_i2c.c needs asm/io.h
  [SPARC64]: Be more resiliant with PCI I/O space regs.
  [SERIAL] SUNHV: Add an ID string.
parents 140ff8b0 be35cf01

arch/sparc/defconfig

+86 −65
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.20-rc1

# Sun Dec 17 14:20:47 2006

# Linux kernel version: 2.6.22-rc1

# Mon May 14 03:25:14 2007

#

CONFIG_MMU=y

CONFIG_HIGHMEM=y

CONFIG_ZONE_DMA=y

CONFIG_GENERIC_ISA_DMA=y

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -23,14 +24,17 @@ CONFIG_LOCALVERSION_AUTO=y 
CONFIG_SWAP=y

CONFIG_SYSVIPC=y

# CONFIG_IPC_NS is not set

CONFIG_SYSVIPC_SYSCTL=y

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_LOG_BUF_SHIFT=14

CONFIG_SYSFS_DEPRECATED=y

# CONFIG_RELAY is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE=""

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_SYSCTL=y
@@ -46,14 +50,19 @@ CONFIG_BUG=y 
CONFIG_ELF_CORE=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_ANON_INODES=y

CONFIG_EPOLL=y

CONFIG_SIGNALFD=y

CONFIG_TIMERFD=y

CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_SLAB=y

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_SLAB=y

# CONFIG_SLUB is not set

# CONFIG_SLOB is not set

CONFIG_RT_MUTEXES=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

# CONFIG_SLOB is not set



#

# Loadable module support
@@ -107,7 +116,7 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y 
CONFIG_SUN_PM=y

# CONFIG_SUN4 is not set

CONFIG_PCI=y

# CONFIG_PCI_MULTITHREAD_PROBE is not set

# CONFIG_ARCH_SUPPORTS_MSI is not set

# CONFIG_PCI_DEBUG is not set

CONFIG_SUN_OPENPROMFS=m

# CONFIG_SPARC_LED is not set
@@ -124,6 +133,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y 
# CONFIG_SPARSEMEM_STATIC is not set

CONFIG_SPLIT_PTLOCK_CPUS=4

# CONFIG_RESOURCES_64BIT is not set

CONFIG_ZONE_DMA_FLAG=1



#

# Networking
@@ -133,14 +143,15 @@ CONFIG_NET=y 
#

# Networking options

#

# CONFIG_NETDEBUG is not set

CONFIG_PACKET=y

# CONFIG_PACKET_MMAP is not set

CONFIG_UNIX=y

CONFIG_XFRM=y

CONFIG_XFRM_USER=m

# CONFIG_XFRM_SUB_POLICY is not set

# CONFIG_XFRM_MIGRATE is not set

CONFIG_NET_KEY=m

# CONFIG_NET_KEY_MIGRATE is not set

CONFIG_INET=y

# CONFIG_IP_MULTICAST is not set

# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -170,6 +181,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
CONFIG_IPV6=m

CONFIG_IPV6_PRIVACY=y

# CONFIG_IPV6_ROUTER_PREF is not set

# CONFIG_IPV6_OPTIMISTIC_DAD is not set

CONFIG_INET6_AH=m

CONFIG_INET6_ESP=m

CONFIG_INET6_IPCOMP=m
@@ -229,7 +241,18 @@ CONFIG_NET_PKTGEN=m 
# CONFIG_HAMRADIO is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set

CONFIG_AF_RXRPC=m

# CONFIG_AF_RXRPC_DEBUG is not set

# CONFIG_RXKAD is not set



#

# Wireless

#

# CONFIG_CFG80211 is not set

# CONFIG_WIRELESS_EXT is not set

# CONFIG_MAC80211 is not set

# CONFIG_IEEE80211 is not set

# CONFIG_RFKILL is not set



#

# Device Drivers
@@ -242,16 +265,13 @@ CONFIG_STANDALONE=y 
CONFIG_PREVENT_FIRMWARE_BUILD=y

# CONFIG_FW_LOADER is not set

# CONFIG_DEBUG_DRIVER is not set

# CONFIG_DEBUG_DEVRES is not set

# CONFIG_SYS_HYPERVISOR is not set



#

# Connector - unified userspace <-> kernelspace linker

#

# CONFIG_CONNECTOR is not set



#

# Memory Technology Devices (MTD)

#

# CONFIG_MTD is not set



#
@@ -262,6 +282,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y 
#

# Plug and Play support

#

# CONFIG_PNPACPI is not set



#

# Block devices
@@ -280,15 +301,16 @@ CONFIG_BLK_DEV_RAM=y 
CONFIG_BLK_DEV_RAM_COUNT=16

CONFIG_BLK_DEV_RAM_SIZE=4096

CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024

CONFIG_BLK_DEV_INITRD=y

# CONFIG_CDROM_PKTCDVD is not set

# CONFIG_ATA_OVER_ETH is not set



#

# Misc devices

#

# CONFIG_PHANTOM is not set

# CONFIG_SGI_IOC4 is not set

# CONFIG_TIFM_CORE is not set

# CONFIG_BLINK is not set



#

# ATA/ATAPI/MFM/RLL support
@@ -322,11 +344,12 @@ CONFIG_CHR_DEV_SG=m 
# CONFIG_SCSI_CONSTANTS is not set

# CONFIG_SCSI_LOGGING is not set

# CONFIG_SCSI_SCAN_ASYNC is not set

CONFIG_SCSI_WAIT_SCAN=m



#

# SCSI Transports

#

CONFIG_SCSI_SPI_ATTRS=m

CONFIG_SCSI_SPI_ATTRS=y

# CONFIG_SCSI_FC_ATTRS is not set

# CONFIG_SCSI_ISCSI_ATTRS is not set

# CONFIG_SCSI_SAS_ATTRS is not set
@@ -366,12 +389,9 @@ CONFIG_SCSI_QLOGICPTI=m 
# CONFIG_SCSI_DC390T is not set

# CONFIG_SCSI_NSP32 is not set

# CONFIG_SCSI_DEBUG is not set

CONFIG_SCSI_ESP_CORE=y

CONFIG_SCSI_SUNESP=y

# CONFIG_SCSI_SRP is not set



#

# Serial ATA (prod) and Parallel ATA (experimental) drivers

#

# CONFIG_ATA is not set



#
@@ -390,6 +410,7 @@ CONFIG_SCSI_SUNESP=y 
#

# IEEE 1394 (FireWire) support

#

# CONFIG_FIREWIRE is not set

# CONFIG_IEEE1394 is not set



#
@@ -410,10 +431,6 @@ CONFIG_TUN=m 
# ARCnet devices

#

# CONFIG_ARCNET is not set



#

# PHY device support

#

# CONFIG_PHYLIB is not set



#
@@ -435,10 +452,7 @@ CONFIG_SUNQE=m 
# CONFIG_NET_TULIP is not set

# CONFIG_HP100 is not set

# CONFIG_NET_PCI is not set



#

# Ethernet (1000 Mbit)

#

CONFIG_NETDEV_1000=y

# CONFIG_ACENIC is not set

# CONFIG_DL2K is not set

# CONFIG_E1000 is not set
@@ -454,15 +468,16 @@ CONFIG_SUNQE=m 
# CONFIG_TIGON3 is not set

# CONFIG_BNX2 is not set

# CONFIG_QLA3XXX is not set



#

# Ethernet (10000 Mbit)

#

# CONFIG_ATL1 is not set

CONFIG_NETDEV_10000=y

# CONFIG_CHELSIO_T1 is not set

# CONFIG_CHELSIO_T3 is not set

# CONFIG_IXGB is not set

# CONFIG_S2IO is not set

# CONFIG_MYRI10GE is not set

# CONFIG_NETXEN_NIC is not set

# CONFIG_MLX4_CORE is not set

CONFIG_MLX4_DEBUG=y



#

# Token Ring devices
@@ -470,13 +485,10 @@ CONFIG_SUNQE=m 
# CONFIG_TR is not set



#

# Wireless LAN (non-hamradio)

#

# CONFIG_NET_RADIO is not set



#

# Wan interfaces

# Wireless LAN

#

# CONFIG_WLAN_PRE80211 is not set

# CONFIG_WLAN_80211 is not set

# CONFIG_WAN is not set

# CONFIG_FDDI is not set

# CONFIG_HIPPI is not set
@@ -528,9 +540,17 @@ CONFIG_KEYBOARD_SUNKBD=m 
# CONFIG_KEYBOARD_STOWAWAY is not set

CONFIG_INPUT_MOUSE=y

CONFIG_MOUSE_PS2=m

CONFIG_MOUSE_PS2_ALPS=y

CONFIG_MOUSE_PS2_LOGIPS2PP=y

CONFIG_MOUSE_PS2_SYNAPTICS=y

CONFIG_MOUSE_PS2_LIFEBOOK=y

CONFIG_MOUSE_PS2_TRACKPOINT=y

# CONFIG_MOUSE_PS2_TOUCHKIT is not set

CONFIG_MOUSE_SERIAL=m

# CONFIG_MOUSE_APPLETOUCH is not set

# CONFIG_MOUSE_VSXXXAA is not set

# CONFIG_INPUT_JOYSTICK is not set

# CONFIG_INPUT_TABLET is not set

# CONFIG_INPUT_TOUCHSCREEN is not set

# CONFIG_INPUT_MISC is not set
@@ -578,14 +598,9 @@ CONFIG_LEGACY_PTY_COUNT=256 
# IPMI

#

# CONFIG_IPMI_HANDLER is not set



#

# Watchdog Cards

#

# CONFIG_WATCHDOG is not set

CONFIG_HW_RANDOM=m

CONFIG_RTC=m

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set

# CONFIG_DRM is not set
@@ -595,10 +610,7 @@ CONFIG_RTC=m 
# TPM devices

#

# CONFIG_TCG_TPM is not set



#

# I2C support

#

CONFIG_DEVPORT=y

# CONFIG_I2C is not set



#
@@ -611,32 +623,39 @@ CONFIG_RTC=m 
# Dallas's 1-wire bus

#

# CONFIG_W1 is not set



#

# Hardware Monitoring support

#

CONFIG_HWMON=y

# CONFIG_HWMON_VID is not set

# CONFIG_SENSORS_ABITUGURU is not set

# CONFIG_SENSORS_F71805F is not set

# CONFIG_SENSORS_PC87427 is not set

# CONFIG_SENSORS_SMSC47M1 is not set

# CONFIG_SENSORS_SMSC47B397 is not set

# CONFIG_SENSORS_VT1211 is not set

# CONFIG_SENSORS_W83627HF is not set

# CONFIG_HWMON_DEBUG_CHIP is not set



#

# Multifunction device drivers

#

# CONFIG_MFD_SM501 is not set



#

# Multimedia devices

#

# CONFIG_VIDEO_DEV is not set

# CONFIG_DVB_CORE is not set

# CONFIG_DAB is not set



#

# Digital Video Broadcasting Devices

# Graphics support

#

# CONFIG_DVB is not set

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

# Graphics support

# Display device support

#

CONFIG_FIRMWARE_EDID=y

# CONFIG_DISPLAY_SUPPORT is not set

# CONFIG_VGASTATE is not set

# CONFIG_FB is not set



#
@@ -644,7 +663,6 @@ CONFIG_FIRMWARE_EDID=y 
#

# CONFIG_PROM_CONSOLE is not set

CONFIG_DUMMY_CONSOLE=y

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

# Sound
@@ -655,6 +673,7 @@ CONFIG_DUMMY_CONSOLE=y 
# HID Devices

#

CONFIG_HID=y

# CONFIG_HID_DEBUG is not set



#

# USB support
@@ -672,10 +691,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y 
# USB Gadget Support

#

# CONFIG_USB_GADGET is not set



#

# MMC/SD Card support

#

# CONFIG_MMC is not set



#
@@ -718,10 +733,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y 
# DMA Devices

#



#

# Virtualization

#



#

# Misc Linux/SPARC drivers

#
@@ -801,6 +812,7 @@ CONFIG_RAMFS=y 
#

# CONFIG_ADFS_FS is not set

# CONFIG_AFFS_FS is not set

# CONFIG_ECRYPT_FS is not set

# CONFIG_HFS_FS is not set

# CONFIG_HFSPLUS_FS is not set

CONFIG_BEFS_FS=m
@@ -827,6 +839,7 @@ CONFIG_LOCKD=y 
CONFIG_NFS_COMMON=y

CONFIG_SUNRPC=y

CONFIG_SUNRPC_GSS=m

# CONFIG_SUNRPC_BIND34 is not set

CONFIG_RPCSEC_GSS_KRB5=m

# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set
@@ -839,7 +852,7 @@ CONFIG_CIFS=m 
# CONFIG_NCP_FS is not set

# CONFIG_CODA_FS is not set

CONFIG_AFS_FS=m

CONFIG_RXRPC=m

# CONFIG_AFS_DEBUG is not set

# CONFIG_9P_FS is not set



#
@@ -913,15 +926,14 @@ CONFIG_MAGIC_SYSRQ=y 
# CONFIG_DEBUG_FS is not set

# CONFIG_HEADERS_CHECK is not set

CONFIG_DEBUG_KERNEL=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_DETECT_SOFTLOCKUP=y

# CONFIG_SCHEDSTATS is not set

# CONFIG_TIMER_STATS is not set

# CONFIG_DEBUG_SLAB is not set

# CONFIG_DEBUG_RT_MUTEXES is not set

# CONFIG_RT_MUTEX_TESTER is not set

# CONFIG_DEBUG_SPINLOCK is not set

# CONFIG_DEBUG_MUTEXES is not set

# CONFIG_DEBUG_RWSEMS is not set

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set

# CONFIG_DEBUG_KOBJECT is not set
@@ -932,12 +944,14 @@ CONFIG_DEBUG_BUGVERBOSE=y 
# CONFIG_DEBUG_LIST is not set

CONFIG_FORCED_INLINING=y

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_FAULT_INJECTION is not set

# CONFIG_DEBUG_STACK_USAGE is not set



#

# Security options

#

# CONFIG_KEYS is not set

CONFIG_KEYS=y

# CONFIG_KEYS_DEBUG_PROC_KEYS is not set

# CONFIG_SECURITY is not set



#
@@ -961,8 +975,11 @@ CONFIG_CRYPTO_SHA512=m 
# CONFIG_CRYPTO_GF128MUL is not set

CONFIG_CRYPTO_ECB=m

CONFIG_CRYPTO_CBC=y

CONFIG_CRYPTO_PCBC=m

# CONFIG_CRYPTO_LRW is not set

# CONFIG_CRYPTO_CRYPTD is not set

CONFIG_CRYPTO_DES=y

# CONFIG_CRYPTO_FCRYPT is not set

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -977,6 +994,7 @@ CONFIG_CRYPTO_ARC4=m 
CONFIG_CRYPTO_DEFLATE=y

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_CRC32C=m

# CONFIG_CRYPTO_CAMELLIA is not set

# CONFIG_CRYPTO_TEST is not set



#
@@ -989,9 +1007,12 @@ CONFIG_CRYPTO_CRC32C=m 
CONFIG_BITREVERSE=y

# CONFIG_CRC_CCITT is not set

# CONFIG_CRC16 is not set

# CONFIG_CRC_ITU_T is not set

CONFIG_CRC32=y

CONFIG_LIBCRC32C=m

CONFIG_ZLIB_INFLATE=y

CONFIG_ZLIB_DEFLATE=y

CONFIG_PLIST=y

CONFIG_IOMAP_COPY=y
 
CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOPORT=y

CONFIG_HAS_DMA=y

arch/sparc/kernel/head.S

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <asm/ptrace.h>

#include <asm/psr.h>

#include <asm/page.h>

#include <linux/kdebug.h>

#include <asm/kdebug.h>

#include <asm/winmacro.h>

#include <asm/thread_info.h>	/* TI_UWINMASK */

#include <asm/errno.h>

arch/sparc64/defconfig

+4 −22
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.21

# Fri May 11 14:31:45 2007

# Linux kernel version: 2.6.22-rc1

# Mon May 14 04:17:48 2007

#

CONFIG_SPARC=y

CONFIG_SPARC64=y
@@ -508,10 +508,6 @@ CONFIG_ISCSI_TCP=m 
# CONFIG_SCSI_ESP_CORE is not set

# CONFIG_SCSI_SUNESP is not set

# CONFIG_SCSI_SRP is not set



#

# Serial ATA (prod) and Parallel ATA (experimental) drivers

#

# CONFIG_ATA is not set



#
@@ -568,10 +564,6 @@ CONFIG_DUMMY=m 
# ARCnet devices

#

# CONFIG_ARCNET is not set



#

# PHY device support

#

# CONFIG_PHYLIB is not set



#
@@ -611,10 +603,7 @@ CONFIG_NET_PCI=y 
# CONFIG_SUNDANCE is not set

# CONFIG_VIA_RHINE is not set

# CONFIG_SC92031 is not set



#

# Ethernet (1000 Mbit)

#

CONFIG_NETDEV_1000=y

# CONFIG_ACENIC is not set

# CONFIG_DL2K is not set

CONFIG_E1000=m
@@ -634,10 +623,7 @@ CONFIG_TIGON3=m 
CONFIG_BNX2=m

# CONFIG_QLA3XXX is not set

# CONFIG_ATL1 is not set



#

# Ethernet (10000 Mbit)

#

CONFIG_NETDEV_10000=y

# CONFIG_CHELSIO_T1 is not set

# CONFIG_CHELSIO_T3 is not set

# CONFIG_IXGB is not set
@@ -667,10 +653,6 @@ CONFIG_MLX4_DEBUG=y 
# CONFIG_USB_RTL8150 is not set

# CONFIG_USB_USBNET_MII is not set

# CONFIG_USB_USBNET is not set



#

# Wan interfaces

#

# CONFIG_WAN is not set

# CONFIG_FDDI is not set

# CONFIG_HIPPI is not set

arch/sparc64/kernel/of_device.c

+7 −0
Original line number Diff line number Diff line
@@ -537,6 +537,13 @@ static int __init build_one_resource(struct device_node *parent, 
			return 0;

	}



	/* When we miss an I/O space match on PCI, just pass it up

	 * to the next PCI bridge and/or controller.

	 */

	if (!strcmp(bus->name, "pci") &&

	    (addr[0] & 0x03000000) == 0x01000000)

		return 0;



	return 1;

}

arch/sparc64/kernel/smp.c

+3 −0
Original line number Diff line number Diff line
@@ -561,6 +561,9 @@ static void hypervisor_xcall_deliver(u64 data0, u64 data1, u64 data2, cpumask_t 
	unsigned long flags, status;

	int cnt, retries, this_cpu, prev_sent, i;



	if (cpus_empty(mask))

		return;



	/* We have to do this whole thing with interrupts fully disabled.

	 * Otherwise if we send an xcall from interrupt context it will

	 * corrupt both our mondo block and cpu list state.

CRA Git | Maintained and supported by SUSTech CRA and CCSE