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

Commit b720a3be 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]: Use Kconfig.preempt
parents 2f8dd850 db2f9f6d

arch/sparc64/Kconfig

+2 −12
Original line number Diff line number Diff line
@@ -136,18 +136,6 @@ config SMP 


	  If you don't know what to do here, say N.



config PREEMPT

	bool "Preemptible Kernel"

	help

	  This option reduces the latency of the kernel when reacting to

	  real-time or interactive events by allowing a low priority process to

	  be preempted even if it is in kernel mode executing a system call.

	  This allows applications to run more reliably even when the system is

	  under load.



	  Say Y here if you are building a kernel for a desktop, embedded

	  or real-time system.  Say N if you are unsure.



config NR_CPUS

	int "Maximum number of CPUs (2-64)"

	range 2 64
@@ -399,6 +387,8 @@ config SCHED_SMT 
	  when dealing with UltraSPARC cpus at a cost of slightly increased

	  overhead in some places. If unsure say N here.



source "kernel/Kconfig.preempt"



config CMDLINE_BOOL

	bool "Default bootloader kernel arguments"

arch/sparc64/defconfig

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

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.21-rc2

# Wed Feb 28 09:50:51 2007

# Linux kernel version: 2.6.21-rc4

# Sat Mar 17 14:18:44 2007

#

CONFIG_SPARC=y

CONFIG_SPARC64=y
@@ -50,6 +50,7 @@ CONFIG_POSIX_MQUEUE=y 
# CONFIG_IKCONFIG is not set

CONFIG_SYSFS_DEPRECATED=y

CONFIG_RELAY=y

# CONFIG_BLK_DEV_INITRD is not set

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_SYSCTL=y

# CONFIG_EMBEDDED is not set
@@ -108,7 +109,6 @@ CONFIG_GENERIC_HARDIRQS=y 
# General machine setup

#

# CONFIG_SMP is not set

# CONFIG_PREEMPT is not set

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_TABLE=m

# CONFIG_CPU_FREQ_DEBUG is not set
@@ -165,6 +165,9 @@ CONFIG_BINFMT_ELF32=y 
CONFIG_BINFMT_ELF=y

CONFIG_BINFMT_MISC=m

CONFIG_SOLARIS_EMUL=y

# CONFIG_PREEMPT_NONE is not set

CONFIG_PREEMPT_VOLUNTARY=y

# CONFIG_PREEMPT is not set

# CONFIG_CMDLINE_BOOL is not set



#
@@ -340,7 +343,6 @@ CONFIG_BLK_DEV_NBD=m 
# CONFIG_BLK_DEV_SX8 is not set

# CONFIG_BLK_DEV_UB is not set

# CONFIG_BLK_DEV_RAM is not set

# CONFIG_BLK_DEV_INITRD is not set

CONFIG_CDROM_PKTCDVD=m

CONFIG_CDROM_PKTCDVD_BUFFERS=8

CONFIG_CDROM_PKTCDVD_WCACHE=y