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

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

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  Cross-compilation between e.g. i386 -> 64bit could break -> work around it
  [IA64] Enable early console for Ski simulator
  [IA64] forbid ptrace changes psr.ri to 3
  [IA64] Failure to grow RBS
  [IA64] Fix processor_get_freq
  [IA64] SGI Altix : fix a force_interrupt bug on altix
  [IA64] Update arch/ia64/configs/* s/SLAB/SLUB/
  [IA64] get back PT_IA_64_UNWIND program header
  [IA64] need NOTES in vmlinux.lds.S
  [IA64] make unwinder stop at last frame of the bootloader
  [IA64] Clean up CPE handler registration
  [IA64] Include Kconfig.preempt
  [IA64] SN2 needs platform specific irq_to_vector() function.
  [IA64] Use atomic64_read to read an atomic64_t.
  [IA64] disable irq's and check need_resched before safe_halt
parents 50568367 11814208

arch/ia64/Kconfig

+1 −11
Original line number Diff line number Diff line
@@ -327,17 +327,7 @@ config FORCE_CPEI_RETARGET 
	This option it useful to enable this feature on older BIOS's as well.

	You can also enable this by using boot command line option force_cpei=1.



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.

source "kernel/Kconfig.preempt"



source "mm/Kconfig"

arch/ia64/configs/bigsur_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ CONFIG_CC_ALIGN_FUNCTIONS=0 
CONFIG_CC_ALIGN_LABELS=0

CONFIG_CC_ALIGN_LOOPS=0

CONFIG_CC_ALIGN_JUMPS=0

CONFIG_SLAB=y

CONFIG_SLUB=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

# CONFIG_SLOB is not set

arch/ia64/configs/gensparse_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ CONFIG_CC_ALIGN_FUNCTIONS=0 
CONFIG_CC_ALIGN_LABELS=0

CONFIG_CC_ALIGN_LOOPS=0

CONFIG_CC_ALIGN_JUMPS=0

CONFIG_SLAB=y

CONFIG_SLUB=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

# CONFIG_SLOB is not set

arch/ia64/configs/sim_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ CONFIG_CC_ALIGN_FUNCTIONS=0 
CONFIG_CC_ALIGN_LABELS=0

CONFIG_CC_ALIGN_LOOPS=0

CONFIG_CC_ALIGN_JUMPS=0

CONFIG_SLAB=y

CONFIG_SLUB=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

# CONFIG_SLOB is not set

arch/ia64/configs/sn2_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ CONFIG_BASE_FULL=y 
CONFIG_FUTEX=y

CONFIG_EPOLL=y

CONFIG_SHMEM=y

CONFIG_SLAB=y

CONFIG_SLUB=y

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_RT_MUTEXES=y

# CONFIG_TINY_SHMEM is not set