Commit 840f51ff 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:
  sparc64: Fix IRQ ->set_affinity() methods.
  sparc: cpumask_of_node() should handle -1 as a node
  sparc64: Update defconfig.
  sparc: Add missing SW perf fault events.
  sparc64: Fully support both performance counters.
  sparc64: Add perf callchain support.
  sparc: convert to arch_gettimeoffset()
  sparc: leds_resource.end assigned to itself in clock_board_probe()
  sparc32: Fix page_to_phys().
  sparc: Simplify param.h by simply including <asm-generic/param.h>
  sparc32: Update defconfig.
  SPARC: use helpers for rlimits
  sparc: copy_from_user() should not return -EFAULT
parents e2197787 1091ce62

arch/sparc/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -64,8 +64,11 @@ config BITS 
	default 64 if SPARC64



config GENERIC_TIME

	def_bool y



config ARCH_USES_GETTIMEOFFSET

	bool

	default y if SPARC64

	default y if SPARC32



config GENERIC_CMOS_UPDATE

	bool

arch/sparc/configs/sparc32_defconfig

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

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.31

# Wed Sep 16 00:03:43 2009

# Linux kernel version: 2.6.33-rc2

# Mon Jan 11 23:20:31 2010

#

# CONFIG_64BIT is not set

CONFIG_SPARC=y
@@ -41,6 +41,7 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y 
#

CONFIG_TREE_RCU=y

# CONFIG_TREE_PREEMPT_RCU is not set

# CONFIG_TINY_RCU is not set

# CONFIG_RCU_TRACE is not set

CONFIG_RCU_FANOUT=32

# CONFIG_RCU_FANOUT_EXACT is not set
@@ -88,21 +89,21 @@ CONFIG_TIMERFD=y 
CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_AIO=y

CONFIG_HAVE_PERF_COUNTERS=y

CONFIG_HAVE_PERF_EVENTS=y

CONFIG_PERF_USE_VMALLOC=y



#

# Performance Counters

# Kernel Performance Events And Counters

#

# CONFIG_PERF_EVENTS is not set

# CONFIG_PERF_COUNTERS is not set

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_PCI_QUIRKS=y

# CONFIG_STRIP_ASM_SYMS is not set

CONFIG_COMPAT_BRK=y

CONFIG_SLAB=y

# CONFIG_SLUB is not set

# CONFIG_SLOB is not set

# CONFIG_PROFILING is not set

# CONFIG_MARKERS is not set

CONFIG_HAVE_OPROFILE=y

CONFIG_HAVE_ARCH_TRACEHOOK=y

CONFIG_HAVE_DMA_ATTRS=y
@@ -131,14 +132,41 @@ CONFIG_LBDAF=y 
# IO Schedulers

#

CONFIG_IOSCHED_NOOP=y

CONFIG_IOSCHED_AS=y

CONFIG_IOSCHED_DEADLINE=y

CONFIG_IOSCHED_CFQ=y

# CONFIG_DEFAULT_AS is not set

# CONFIG_DEFAULT_DEADLINE is not set

CONFIG_DEFAULT_CFQ=y

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="cfq"

# CONFIG_INLINE_SPIN_TRYLOCK is not set

# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set

# CONFIG_INLINE_SPIN_LOCK is not set

# CONFIG_INLINE_SPIN_LOCK_BH is not set

# CONFIG_INLINE_SPIN_LOCK_IRQ is not set

# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set

CONFIG_INLINE_SPIN_UNLOCK=y

# CONFIG_INLINE_SPIN_UNLOCK_BH is not set

CONFIG_INLINE_SPIN_UNLOCK_IRQ=y

# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set

# CONFIG_INLINE_READ_TRYLOCK is not set

# CONFIG_INLINE_READ_LOCK is not set

# CONFIG_INLINE_READ_LOCK_BH is not set

# CONFIG_INLINE_READ_LOCK_IRQ is not set

# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set

CONFIG_INLINE_READ_UNLOCK=y

# CONFIG_INLINE_READ_UNLOCK_BH is not set

CONFIG_INLINE_READ_UNLOCK_IRQ=y

# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set

# CONFIG_INLINE_WRITE_TRYLOCK is not set

# CONFIG_INLINE_WRITE_LOCK is not set

# CONFIG_INLINE_WRITE_LOCK_BH is not set

# CONFIG_INLINE_WRITE_LOCK_IRQ is not set

# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set

CONFIG_INLINE_WRITE_UNLOCK=y

# CONFIG_INLINE_WRITE_UNLOCK_BH is not set

CONFIG_INLINE_WRITE_UNLOCK_IRQ=y

# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set

# CONFIG_MUTEX_SPIN_ON_OWNER is not set

# CONFIG_FREEZER is not set



#
@@ -168,8 +196,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 
# CONFIG_PHYS_ADDR_T_64BIT is not set

CONFIG_ZONE_DMA_FLAG=1

CONFIG_BOUNCE=y

CONFIG_HAVE_MLOCK=y

CONFIG_HAVE_MLOCKED_PAGE_BIT=y

# CONFIG_KSM is not set

CONFIG_DEFAULT_MMAP_MIN_ADDR=4096

CONFIG_SUN_PM=y

# CONFIG_SPARC_LED is not set
@@ -257,6 +284,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m 
CONFIG_INET6_XFRM_MODE_BEET=m

# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set

CONFIG_IPV6_SIT=m

# CONFIG_IPV6_SIT_6RD is not set

CONFIG_IPV6_NDISC_NODETYPE=y

CONFIG_IPV6_TUNNEL=m

# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -295,9 +323,6 @@ CONFIG_NET_PKTGEN=m 
# CONFIG_AF_RXRPC is not set

CONFIG_WIRELESS=y

# CONFIG_CFG80211 is not set

CONFIG_CFG80211_DEFAULT_PS_VALUE=0

CONFIG_WIRELESS_OLD_REGULATORY=y

# CONFIG_WIRELESS_EXT is not set

# CONFIG_LIB80211 is not set



#
@@ -335,6 +360,10 @@ CONFIG_BLK_DEV=y 
# CONFIG_BLK_DEV_COW_COMMON is not set

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_CRYPTOLOOP=m



#

# DRBD disabled because PROC_FS, INET or CONNECTOR not selected

#

# CONFIG_BLK_DEV_NBD is not set

# CONFIG_BLK_DEV_SX8 is not set

CONFIG_BLK_DEV_RAM=y
@@ -398,8 +427,11 @@ CONFIG_SCSI_LOWLEVEL=y 
# CONFIG_ISCSI_TCP is not set

# CONFIG_SCSI_CXGB3_ISCSI is not set

# CONFIG_SCSI_BNX2_ISCSI is not set

# CONFIG_BE2ISCSI is not set

# CONFIG_BLK_DEV_3W_XXXX_RAID is not set

# CONFIG_SCSI_HPSA is not set

# CONFIG_SCSI_3W_9XXX is not set

# CONFIG_SCSI_3W_SAS is not set

# CONFIG_SCSI_ACARD is not set

# CONFIG_SCSI_AACRAID is not set

# CONFIG_SCSI_AIC7XXX is not set
@@ -434,7 +466,9 @@ CONFIG_SCSI_QLOGICPTI=m 
# CONFIG_SCSI_DEBUG is not set

CONFIG_SCSI_SUNESP=y

# CONFIG_SCSI_PMCRAID is not set

# CONFIG_SCSI_PM8001 is not set

# CONFIG_SCSI_SRP is not set

# CONFIG_SCSI_BFA_FC is not set

# CONFIG_SCSI_DH is not set

# CONFIG_SCSI_OSD_INITIATOR is not set

# CONFIG_ATA is not set
@@ -450,7 +484,7 @@ CONFIG_SCSI_SUNESP=y 
#



#

# See the help texts for more information.

# The newer stack is recommended.

#

# CONFIG_FIREWIRE is not set

# CONFIG_IEEE1394 is not set
@@ -487,6 +521,7 @@ CONFIG_SUNQE=m 
# CONFIG_NET_PCI is not set

# CONFIG_B44 is not set

# CONFIG_KS8842 is not set

# CONFIG_KS8851_MLL is not set

# CONFIG_ATL2 is not set

CONFIG_NETDEV_1000=y

# CONFIG_ACENIC is not set
@@ -546,6 +581,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y 
# CONFIG_NETCONSOLE is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set

# CONFIG_VMXNET3 is not set

# CONFIG_ISDN is not set

# CONFIG_PHONE is not set
@@ -555,6 +591,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y 
CONFIG_INPUT=y

# CONFIG_INPUT_FF_MEMLESS is not set

# CONFIG_INPUT_POLLDEV is not set

# CONFIG_INPUT_SPARSEKMAP is not set



#

# Userland interfaces
@@ -574,6 +611,7 @@ CONFIG_INPUT_KEYBOARD=y 
CONFIG_KEYBOARD_ATKBD=m

# CONFIG_KEYBOARD_LKKBD is not set

# CONFIG_KEYBOARD_NEWTON is not set

# CONFIG_KEYBOARD_OPENCORES is not set

# CONFIG_KEYBOARD_STOWAWAY is not set

CONFIG_KEYBOARD_SUNKBD=m

# CONFIG_KEYBOARD_XTKBD is not set
@@ -604,6 +642,7 @@ CONFIG_SERIO_SERPORT=m 
# CONFIG_SERIO_PCIPS2 is not set

CONFIG_SERIO_LIBPS2=m

# CONFIG_SERIO_RAW is not set

# CONFIG_SERIO_ALTERA_PS2 is not set

# CONFIG_GAMEPORT is not set



#
@@ -636,6 +675,7 @@ CONFIG_SERIAL_CORE=y 
CONFIG_SERIAL_CORE_CONSOLE=y

CONFIG_CONSOLE_POLL=y

# CONFIG_SERIAL_JSM is not set

# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set

CONFIG_UNIX98_PTYS=y

# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set

CONFIG_LEGACY_PTYS=y
@@ -661,6 +701,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y 
# CONFIG_POWER_SUPPLY is not set

CONFIG_HWMON=y

# CONFIG_HWMON_VID is not set

# CONFIG_HWMON_DEBUG_CHIP is not set



#

# Native drivers

#

# CONFIG_SENSORS_I5K_AMB is not set

# CONFIG_SENSORS_F71805F is not set

# CONFIG_SENSORS_F71882FG is not set
@@ -675,9 +720,7 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_VT8231 is not set

# CONFIG_SENSORS_W83627HF is not set

# CONFIG_SENSORS_W83627EHF is not set

# CONFIG_HWMON_DEBUG_CHIP is not set

# CONFIG_THERMAL is not set

# CONFIG_THERMAL_HWMON is not set

# CONFIG_WATCHDOG is not set

CONFIG_SSB_POSSIBLE=y
@@ -699,6 +742,7 @@ CONFIG_SSB_POSSIBLE=y 
#

# Graphics support

#

CONFIG_VGA_ARB=y

# CONFIG_VGASTATE is not set

# CONFIG_VIDEO_OUTPUT_CONTROL is not set

# CONFIG_FB is not set
@@ -776,7 +820,9 @@ CONFIG_RTC_INTF_DEV=y 
# CONFIG_RTC_DRV_M48T86 is not set

# CONFIG_RTC_DRV_M48T35 is not set

CONFIG_RTC_DRV_M48T59=y

# CONFIG_RTC_DRV_MSM6242 is not set

# CONFIG_RTC_DRV_BQ4802 is not set

# CONFIG_RTC_DRV_RP5C01 is not set

# CONFIG_RTC_DRV_V3020 is not set



#
@@ -955,6 +1001,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y 
CONFIG_ENABLE_MUST_CHECK=y

CONFIG_FRAME_WARN=1024

CONFIG_MAGIC_SYSRQ=y

# CONFIG_STRIP_ASM_SYMS is not set

# CONFIG_UNUSED_SYMBOLS is not set

# CONFIG_DEBUG_FS is not set

# CONFIG_HEADERS_CHECK is not set
@@ -1003,9 +1050,9 @@ CONFIG_KGDB=y 
CONFIG_KGDB_SERIAL_CONSOLE=y

CONFIG_KGDB_TESTS=y

# CONFIG_KGDB_TESTS_ON_BOOT is not set

# CONFIG_KMEMCHECK is not set

# CONFIG_DEBUG_STACK_USAGE is not set

# CONFIG_STACK_DEBUG is not set

# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set



#

# Security options
@@ -1013,7 +1060,11 @@ CONFIG_KGDB_TESTS=y 
# CONFIG_KEYS is not set

# CONFIG_SECURITY is not set

# CONFIG_SECURITYFS is not set

# CONFIG_SECURITY_FILE_CAPABILITIES is not set

# CONFIG_DEFAULT_SECURITY_SELINUX is not set

# CONFIG_DEFAULT_SECURITY_SMACK is not set

# CONFIG_DEFAULT_SECURITY_TOMOYO is not set

CONFIG_DEFAULT_SECURITY_DAC=y

CONFIG_DEFAULT_SECURITY=""

CONFIG_CRYPTO=y



#

arch/sparc/configs/sparc64_defconfig

+100 −31
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.31

# Tue Sep 15 17:06:03 2009

# Linux kernel version: 2.6.33-rc2

# Wed Jan 20 16:31:47 2010

#

CONFIG_64BIT=y

CONFIG_SPARC=y
@@ -20,6 +20,7 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y 
CONFIG_AUDIT_ARCH=y

CONFIG_HAVE_SETUP_PER_CPU_AREA=y

CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y

CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y

CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y

CONFIG_MMU=y

CONFIG_ARCH_NO_VIRT_TO_BUS=y
@@ -50,6 +51,7 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y 
#

CONFIG_TREE_RCU=y

# CONFIG_TREE_PREEMPT_RCU is not set

# CONFIG_TINY_RCU is not set

# CONFIG_RCU_TRACE is not set

CONFIG_RCU_FANOUT=64

# CONFIG_RCU_FANOUT_EXACT is not set
@@ -62,8 +64,7 @@ CONFIG_RT_GROUP_SCHED=y 
CONFIG_USER_SCHED=y

# CONFIG_CGROUP_SCHED is not set

# CONFIG_CGROUPS is not set

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

# CONFIG_SYSFS_DEPRECATED_V2 is not set

CONFIG_RELAY=y

CONFIG_NAMESPACES=y

# CONFIG_UTS_NS is not set
@@ -97,24 +98,25 @@ CONFIG_TIMERFD=y 
CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_AIO=y

CONFIG_HAVE_PERF_COUNTERS=y

CONFIG_HAVE_PERF_EVENTS=y

CONFIG_PERF_USE_VMALLOC=y



#

# Performance Counters

# Kernel Performance Events And Counters

#

CONFIG_PERF_COUNTERS=y

CONFIG_PERF_EVENTS=y

CONFIG_EVENT_PROFILE=y

CONFIG_PERF_COUNTERS=y

# CONFIG_DEBUG_PERF_USE_VMALLOC is not set

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_PCI_QUIRKS=y

CONFIG_SLUB_DEBUG=y

# CONFIG_STRIP_ASM_SYMS is not set

# CONFIG_COMPAT_BRK is not set

# CONFIG_SLAB is not set

CONFIG_SLUB=y

# CONFIG_SLOB is not set

CONFIG_PROFILING=y

CONFIG_TRACEPOINTS=y

CONFIG_MARKERS=y

CONFIG_OPROFILE=m

CONFIG_HAVE_OPROFILE=y

CONFIG_KPROBES=y
@@ -152,14 +154,41 @@ CONFIG_BLOCK_COMPAT=y 
# IO Schedulers

#

CONFIG_IOSCHED_NOOP=y

CONFIG_IOSCHED_AS=y

CONFIG_IOSCHED_DEADLINE=y

CONFIG_IOSCHED_CFQ=y

CONFIG_DEFAULT_AS=y

# CONFIG_DEFAULT_DEADLINE is not set

# CONFIG_DEFAULT_CFQ is not set

CONFIG_DEFAULT_CFQ=y

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="anticipatory"

CONFIG_DEFAULT_IOSCHED="cfq"

# CONFIG_INLINE_SPIN_TRYLOCK is not set

# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set

# CONFIG_INLINE_SPIN_LOCK is not set

# CONFIG_INLINE_SPIN_LOCK_BH is not set

# CONFIG_INLINE_SPIN_LOCK_IRQ is not set

# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set

CONFIG_INLINE_SPIN_UNLOCK=y

# CONFIG_INLINE_SPIN_UNLOCK_BH is not set

CONFIG_INLINE_SPIN_UNLOCK_IRQ=y

# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set

# CONFIG_INLINE_READ_TRYLOCK is not set

# CONFIG_INLINE_READ_LOCK is not set

# CONFIG_INLINE_READ_LOCK_BH is not set

# CONFIG_INLINE_READ_LOCK_IRQ is not set

# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set

CONFIG_INLINE_READ_UNLOCK=y

# CONFIG_INLINE_READ_UNLOCK_BH is not set

CONFIG_INLINE_READ_UNLOCK_IRQ=y

# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set

# CONFIG_INLINE_WRITE_TRYLOCK is not set

# CONFIG_INLINE_WRITE_LOCK is not set

# CONFIG_INLINE_WRITE_LOCK_BH is not set

# CONFIG_INLINE_WRITE_LOCK_IRQ is not set

# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set

CONFIG_INLINE_WRITE_UNLOCK=y

# CONFIG_INLINE_WRITE_UNLOCK_BH is not set

CONFIG_INLINE_WRITE_UNLOCK_IRQ=y

# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set

CONFIG_MUTEX_SPIN_ON_OWNER=y

# CONFIG_FREEZER is not set



#
@@ -179,6 +208,7 @@ CONFIG_GENERIC_HWEIGHT=y 
CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_ARCH_MAY_HAVE_PC_FDC=y

CONFIG_SPARC64_SMP=y

CONFIG_EARLYFB=y

CONFIG_SPARC64_PAGE_SIZE_8KB=y

# CONFIG_SPARC64_PAGE_SIZE_64KB is not set

CONFIG_SECCOMP=y
@@ -216,8 +246,7 @@ CONFIG_MIGRATION=y 
CONFIG_PHYS_ADDR_T_64BIT=y

CONFIG_ZONE_DMA_FLAG=0

CONFIG_NR_QUICK=1

CONFIG_HAVE_MLOCK=y

CONFIG_HAVE_MLOCKED_PAGE_BIT=y

# CONFIG_KSM is not set

CONFIG_DEFAULT_MMAP_MIN_ADDR=8192

CONFIG_SCHED_SMT=y

CONFIG_SCHED_MC=y
@@ -315,6 +344,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m 
CONFIG_INET6_XFRM_MODE_BEET=m

# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set

CONFIG_IPV6_SIT=m

# CONFIG_IPV6_SIT_6RD is not set

CONFIG_IPV6_NDISC_NODETYPE=y

CONFIG_IPV6_TUNNEL=m

# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -356,9 +386,6 @@ CONFIG_NET_TCPPROBE=m 
# CONFIG_AF_RXRPC is not set

CONFIG_WIRELESS=y

# CONFIG_CFG80211 is not set

CONFIG_CFG80211_DEFAULT_PS_VALUE=0

CONFIG_WIRELESS_OLD_REGULATORY=y

# CONFIG_WIRELESS_EXT is not set

# CONFIG_LIB80211 is not set



#
@@ -376,6 +403,7 @@ CONFIG_WIRELESS_OLD_REGULATORY=y 
# Generic Driver Options

#

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_DEVTMPFS is not set

CONFIG_STANDALONE=y

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

CONFIG_FW_LOADER=y
@@ -397,6 +425,11 @@ CONFIG_BLK_DEV=y 
# CONFIG_BLK_DEV_COW_COMMON is not set

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_CRYPTOLOOP=m



#

# DRBD disabled because PROC_FS, INET or CONNECTOR not selected

#

# CONFIG_BLK_DEV_DRBD is not set

CONFIG_BLK_DEV_NBD=m

# CONFIG_BLK_DEV_SX8 is not set

# CONFIG_BLK_DEV_UB is not set
@@ -408,6 +441,7 @@ CONFIG_ATA_OVER_ETH=m 
CONFIG_SUNVDC=m

# CONFIG_BLK_DEV_HD is not set

CONFIG_MISC_DEVICES=y

# CONFIG_AD525X_DPOT is not set

# CONFIG_PHANTOM is not set

# CONFIG_SGI_IOC4 is not set

# CONFIG_TIFM_CORE is not set
@@ -415,6 +449,7 @@ CONFIG_MISC_DEVICES=y 
# CONFIG_ENCLOSURE_SERVICES is not set

# CONFIG_HP_ILO is not set

# CONFIG_ISL29003 is not set

# CONFIG_DS1682 is not set

# CONFIG_C2PORT is not set



#
@@ -522,8 +557,11 @@ CONFIG_SCSI_LOWLEVEL=y 
# CONFIG_ISCSI_TCP is not set

# CONFIG_SCSI_CXGB3_ISCSI is not set

# CONFIG_SCSI_BNX2_ISCSI is not set

# CONFIG_BE2ISCSI is not set

# CONFIG_BLK_DEV_3W_XXXX_RAID is not set

# CONFIG_SCSI_HPSA is not set

# CONFIG_SCSI_3W_9XXX is not set

# CONFIG_SCSI_3W_SAS is not set

# CONFIG_SCSI_ACARD is not set

# CONFIG_SCSI_AACRAID is not set

# CONFIG_SCSI_AIC7XXX is not set
@@ -557,7 +595,9 @@ CONFIG_SCSI_LOWLEVEL=y 
# CONFIG_SCSI_DEBUG is not set

# CONFIG_SCSI_SUNESP is not set

# CONFIG_SCSI_PMCRAID is not set

# CONFIG_SCSI_PM8001 is not set

# CONFIG_SCSI_SRP is not set

# CONFIG_SCSI_BFA_FC is not set

# CONFIG_SCSI_DH is not set

# CONFIG_SCSI_OSD_INITIATOR is not set

# CONFIG_ATA is not set
@@ -568,7 +608,9 @@ CONFIG_MD_RAID0=m 
CONFIG_MD_RAID1=m

CONFIG_MD_RAID10=m

CONFIG_MD_RAID456=m

# CONFIG_MULTICORE_RAID456 is not set

CONFIG_MD_RAID6_PQ=m

# CONFIG_ASYNC_RAID6_TEST is not set

CONFIG_MD_MULTIPATH=m

# CONFIG_MD_FAULTY is not set

CONFIG_BLK_DEV_DM=m
@@ -592,7 +634,7 @@ CONFIG_DM_ZERO=m 
#



#

# See the help texts for more information.

# The newer stack is recommended.

#

# CONFIG_FIREWIRE is not set

# CONFIG_IEEE1394 is not set
@@ -664,6 +706,7 @@ CONFIG_NET_PCI=y 
# CONFIG_SUNDANCE is not set

# CONFIG_TLAN is not set

# CONFIG_KS8842 is not set

# CONFIG_KS8851_MLL is not set

# CONFIG_VIA_RHINE is not set

# CONFIG_SC92031 is not set

# CONFIG_ATL2 is not set
@@ -745,6 +788,7 @@ CONFIG_SLHC=m 
# CONFIG_NETCONSOLE is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set

# CONFIG_VMXNET3 is not set

# CONFIG_ISDN is not set

# CONFIG_PHONE is not set
@@ -754,6 +798,7 @@ CONFIG_SLHC=m 
CONFIG_INPUT=y

# CONFIG_INPUT_FF_MEMLESS is not set

# CONFIG_INPUT_POLLDEV is not set

# CONFIG_INPUT_SPARSEKMAP is not set



#

# Userland interfaces
@@ -770,9 +815,13 @@ CONFIG_INPUT_EVDEV=y 
# Input Device Drivers

#

CONFIG_INPUT_KEYBOARD=y

# CONFIG_KEYBOARD_ADP5588 is not set

CONFIG_KEYBOARD_ATKBD=y

# CONFIG_QT2160 is not set

CONFIG_KEYBOARD_LKKBD=m

# CONFIG_KEYBOARD_MAX7359 is not set

# CONFIG_KEYBOARD_NEWTON is not set

# CONFIG_KEYBOARD_OPENCORES is not set

# CONFIG_KEYBOARD_STOWAWAY is not set

CONFIG_KEYBOARD_SUNKBD=y

# CONFIG_KEYBOARD_XTKBD is not set
@@ -812,6 +861,7 @@ CONFIG_SERIO_I8042=y 
CONFIG_SERIO_PCIPS2=m

CONFIG_SERIO_LIBPS2=y

CONFIG_SERIO_RAW=m

# CONFIG_SERIO_ALTERA_PS2 is not set

# CONFIG_GAMEPORT is not set



#
@@ -844,6 +894,7 @@ CONFIG_SERIAL_SUNHV=y 
CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE_CONSOLE=y

# CONFIG_SERIAL_JSM is not set

# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set

CONFIG_UNIX98_PTYS=y

# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set

# CONFIG_LEGACY_PTYS is not set
@@ -858,6 +909,7 @@ CONFIG_HW_RANDOM_N2RNG=m 
CONFIG_DEVPORT=y

CONFIG_I2C=y

CONFIG_I2C_BOARDINFO=y

CONFIG_I2C_COMPAT=y

# CONFIG_I2C_CHARDEV is not set

CONFIG_I2C_HELPER_AUTO=y

CONFIG_I2C_ALGOBIT=y
@@ -897,11 +949,6 @@ CONFIG_I2C_ALGOBIT=y 
# CONFIG_I2C_TAOS_EVM is not set

# CONFIG_I2C_TINY_USB is not set



#

# Graphics adapter I2C/DDC channel drivers

#

# CONFIG_I2C_VOODOO3 is not set



#

# Other I2C/SMBus bus drivers

#
@@ -911,10 +958,6 @@ CONFIG_I2C_ALGOBIT=y 
#

# Miscellaneous I2C Chip support

#

# CONFIG_DS1682 is not set

# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_PCF8575 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set
@@ -932,6 +975,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y 
# CONFIG_POWER_SUPPLY is not set

CONFIG_HWMON=y

# CONFIG_HWMON_VID is not set

# CONFIG_HWMON_DEBUG_CHIP is not set



#

# Native drivers

#

# CONFIG_SENSORS_AD7414 is not set

# CONFIG_SENSORS_AD7418 is not set

# CONFIG_SENSORS_ADM1021 is not set
@@ -955,6 +1003,7 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_GL520SM is not set

# CONFIG_SENSORS_IT87 is not set

# CONFIG_SENSORS_LM63 is not set

# CONFIG_SENSORS_LM73 is not set

# CONFIG_SENSORS_LM75 is not set

# CONFIG_SENSORS_LM77 is not set

# CONFIG_SENSORS_LM78 is not set
@@ -981,6 +1030,7 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_ADS7828 is not set

# CONFIG_SENSORS_THMC50 is not set

# CONFIG_SENSORS_TMP401 is not set

# CONFIG_SENSORS_TMP421 is not set

# CONFIG_SENSORS_VIA686A is not set

# CONFIG_SENSORS_VT1211 is not set

# CONFIG_SENSORS_VT8231 is not set
@@ -993,9 +1043,8 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_W83627HF is not set

# CONFIG_SENSORS_W83627EHF is not set

# CONFIG_SENSORS_ULTRA45 is not set

# CONFIG_HWMON_DEBUG_CHIP is not set

# CONFIG_SENSORS_LIS3_I2C is not set

# CONFIG_THERMAL is not set

# CONFIG_THERMAL_HWMON is not set

# CONFIG_WATCHDOG is not set

CONFIG_SSB_POSSIBLE=y
@@ -1013,16 +1062,20 @@ CONFIG_SSB_POSSIBLE=y 
# CONFIG_TWL4030_CORE is not set

# CONFIG_MFD_TMIO is not set

# CONFIG_PMIC_DA903X is not set

# CONFIG_PMIC_ADP5520 is not set

# CONFIG_MFD_WM8400 is not set

# CONFIG_MFD_WM831X is not set

# CONFIG_MFD_WM8350_I2C is not set

# CONFIG_MFD_PCF50633 is not set

# CONFIG_AB3100_CORE is not set

# CONFIG_MFD_88PM8607 is not set

# CONFIG_REGULATOR is not set

# CONFIG_MEDIA_SUPPORT is not set



#

# Graphics support

#

CONFIG_VGA_ARB=y

# CONFIG_DRM is not set

# CONFIG_VGASTATE is not set

# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1176,6 +1229,7 @@ CONFIG_SND_ALI5451=m 
# CONFIG_SND_OXYGEN is not set

# CONFIG_SND_CS4281 is not set

# CONFIG_SND_CS46XX is not set

# CONFIG_SND_CS5535AUDIO is not set

# CONFIG_SND_CTXFI is not set

# CONFIG_SND_DARLA20 is not set

# CONFIG_SND_GINA20 is not set
@@ -1311,6 +1365,7 @@ CONFIG_USB_EHCI_HCD=m 
# CONFIG_USB_OXU210HP_HCD is not set

# CONFIG_USB_ISP116X_HCD is not set

# CONFIG_USB_ISP1760_HCD is not set

# CONFIG_USB_ISP1362_HCD is not set

CONFIG_USB_OHCI_HCD=y

# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set

# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
@@ -1426,6 +1481,7 @@ CONFIG_RTC_INTF_DEV=y 
# CONFIG_RTC_DRV_PCF8563 is not set

# CONFIG_RTC_DRV_PCF8583 is not set

# CONFIG_RTC_DRV_M41T80 is not set

# CONFIG_RTC_DRV_BQ32K is not set

# CONFIG_RTC_DRV_S35390A is not set

# CONFIG_RTC_DRV_FM3130 is not set

# CONFIG_RTC_DRV_RX8581 is not set
@@ -1447,7 +1503,9 @@ CONFIG_RTC_DRV_CMOS=y 
# CONFIG_RTC_DRV_M48T86 is not set

# CONFIG_RTC_DRV_M48T35 is not set

CONFIG_RTC_DRV_M48T59=y

# CONFIG_RTC_DRV_MSM6242 is not set

CONFIG_RTC_DRV_BQ4802=y

# CONFIG_RTC_DRV_RP5C01 is not set

# CONFIG_RTC_DRV_V3020 is not set



#
@@ -1625,6 +1683,7 @@ CONFIG_PRINTK_TIME=y 
CONFIG_ENABLE_MUST_CHECK=y

CONFIG_FRAME_WARN=2048

CONFIG_MAGIC_SYSRQ=y

# CONFIG_STRIP_ASM_SYMS is not set

# CONFIG_UNUSED_SYMBOLS is not set

CONFIG_DEBUG_FS=y

# CONFIG_HEADERS_CHECK is not set
@@ -1678,9 +1737,11 @@ CONFIG_NOP_TRACER=y 
CONFIG_HAVE_FUNCTION_TRACER=y

CONFIG_HAVE_DYNAMIC_FTRACE=y

CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y

CONFIG_HAVE_SYSCALL_TRACEPOINTS=y

CONFIG_RING_BUFFER=y

CONFIG_EVENT_TRACING=y

CONFIG_CONTEXT_SWITCH_TRACER=y

CONFIG_RING_BUFFER_ALLOW_SWAP=y

CONFIG_TRACING=y

CONFIG_GENERIC_TRACER=y

CONFIG_TRACING_SUPPORT=y
@@ -1688,6 +1749,7 @@ CONFIG_FTRACE=y 
# CONFIG_FUNCTION_TRACER is not set

# CONFIG_IRQSOFF_TRACER is not set

# CONFIG_SCHED_TRACER is not set

# CONFIG_FTRACE_SYSCALLS is not set

# CONFIG_BOOT_TRACER is not set

CONFIG_BRANCH_PROFILE_NONE=y

# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
@@ -1706,6 +1768,7 @@ CONFIG_HAVE_ARCH_KGDB=y 
# CONFIG_DEBUG_STACK_USAGE is not set

# CONFIG_DEBUG_DCFLUSH is not set

# CONFIG_STACK_DEBUG is not set

# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set



#

# Security options
@@ -1714,11 +1777,17 @@ CONFIG_KEYS=y 
# CONFIG_KEYS_DEBUG_PROC_KEYS is not set

# CONFIG_SECURITY is not set

# CONFIG_SECURITYFS is not set

# CONFIG_SECURITY_FILE_CAPABILITIES is not set

# CONFIG_DEFAULT_SECURITY_SELINUX is not set

# CONFIG_DEFAULT_SECURITY_SMACK is not set

# CONFIG_DEFAULT_SECURITY_TOMOYO is not set

CONFIG_DEFAULT_SECURITY_DAC=y

CONFIG_DEFAULT_SECURITY=""

CONFIG_XOR_BLOCKS=m

CONFIG_ASYNC_CORE=m

CONFIG_ASYNC_MEMCPY=m

CONFIG_ASYNC_XOR=m

CONFIG_ASYNC_PQ=m

CONFIG_ASYNC_RAID6_RECOV=m

CONFIG_CRYPTO=y



#

arch/sparc/include/asm/io_32.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#include <asm/page.h>      /* IO address mapping routines need this */

#include <asm/system.h>



#define page_to_phys(page)	(((page) - mem_map) << PAGE_SHIFT)

#define page_to_phys(page)	(page_to_pfn(page) << PAGE_SHIFT)



static inline u32 flip_dword (u32 l)

{

arch/sparc/include/asm/page_32.h

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ extern unsigned long pfn_base; 
#define phys_to_virt		__va



#define ARCH_PFN_OFFSET		(pfn_base)

#define virt_to_page(kaddr)	(mem_map + ((((unsigned long)(kaddr)-PAGE_OFFSET)>>PAGE_SHIFT)))

#define virt_to_page(kaddr)	pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)



#define pfn_valid(pfn)		(((pfn) >= (pfn_base)) && (((pfn)-(pfn_base)) < max_mapnr))

#define virt_addr_valid(kaddr)	((((unsigned long)(kaddr)-PAGE_OFFSET)>>PAGE_SHIFT) < max_mapnr)

CRA Git | Maintained and supported by SUSTech CRA and CCSE