Merge branches 'x86-urgent-for-linus', 'core-debug-for-linus', 'irq-core-for-linus...

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  um: Make rwsem.S depend on CONFIG_RWSEM_XCHGADD_ALGORITHM

* 'core-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  debug: Make CONFIG_EXPERT select CONFIG_DEBUG_KERNEL to unhide debug options

* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  genirq: Remove unused CHECK_IRQ_PER_CPU()

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf tools, x86: Fix 32-bit compile on 64-bit system

diff --combined include/linux/irq.h
index baa397e,8b45384,8b45384,68258f0,baa397e..5f69504
--- 1/include/linux/irq.h
--- 2/include/linux/irq.h
--- 3/include/linux/irq.h
--- 4/include/linux/irq.h
--- 5/include/linux/irq.h
+++ b/include/linux/irq.h
@@@@@@ -96,11 -96,11 -96,11 -96,6 -96,11 +96,6 @@@@@@ enum 
     
     #define IRQ_NO_BALANCING_MASK      (IRQ_PER_CPU | IRQ_NO_BALANCING)
     
--- -static inline __deprecated bool CHECK_IRQ_PER_CPU(unsigned int status)
--- -{
--- -   return status & IRQ_PER_CPU;
--- -}
--- -
     /*
      * Return value for chip->irq_set_affinity()
      *
@@@@@@ -676,8 -676,7 -676,7 -671,7 -676,8 +671,8 @@@@@@ void irq_gc_mask_disable_reg(struct irq
     void irq_gc_mask_set_bit(struct irq_data *d);
     void irq_gc_mask_clr_bit(struct irq_data *d);
     void irq_gc_unmask_enable_reg(struct irq_data *d);
 --- void irq_gc_ack(struct irq_data *d);
 +++ void irq_gc_ack_set_bit(struct irq_data *d);
 +++ void irq_gc_ack_clr_bit(struct irq_data *d);
     void irq_gc_mask_disable_reg_and_ack(struct irq_data *d);
     void irq_gc_eoi(struct irq_data *d);
     int irq_gc_set_wake(struct irq_data *d, unsigned int on);

diff --combined init/Kconfig
index 27b8a7a,ebafac4,14370d3,412c21b,412c21b..e20aa31
--- 1/init/Kconfig
--- 2/init/Kconfig
--- 3/init/Kconfig
--- 4/init/Kconfig
--- 5/init/Kconfig
+++ b/init/Kconfig
@@@@@@ -19,6 -19,7 -19,7 -19,6 -19,6 +19,6 @@@@@@ config DEFCONFIG_LIS
     config CONSTRUCTORS
        bool
        depends on !UML
 --     default y
     
     config HAVE_IRQ_WORK
        bool
@@@@@@ -203,15 -204,6 -204,6 -203,15 -203,15 +203,15 @@@@@@ config KERNEL_LZ
     
     endchoice
     
 ++  config DEFAULT_HOSTNAME
 ++     string "Default hostname"
 ++     default "(none)"
 ++     help
 ++       This option determines the default system hostname before userspace
 ++       calls sethostname(2). The kernel traditionally uses "(none)" here,
 ++       but you may wish to use a different default here to make a minimal
 ++       system more usable with less configuration.
 ++  
     config SWAP
        bool "Support for paging of anonymous memory (swap)"
        depends on MMU && BLOCK
@@@@@@ -917,6 -909,6 -909,8 -917,6 -917,6 +917,8 @@@@@@ config ANON_INODE
     
     menuconfig EXPERT
        bool "Configure standard kernel features (expert users)"
++ ++   # Unhide debug options, to make the on-by-default options visible
++ ++   select DEBUG_KERNEL
        help
          This option allows certain base kernel options and settings
               to be disabled or tweaked. This is for specialized
@@@@@@ -1007,19 -999,14 -1001,14 -1007,14 -1007,14 +1009,19 @@@@@@ config ELF_COR
        help
          Enable support for generating core dumps. Disabling saves about 4k.
     
 ++++
     config PCSPKR_PLATFORM
        bool "Enable PC-Speaker support" if EXPERT
 ----   depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
 ++++   depends on HAVE_PCSPKR_PLATFORM
 ++++   select I8253_LOCK
        default y
        help
               This option allows to disable the internal PC-Speaker
               support, saving some memory.
     
 ++++config HAVE_PCSPKR_PLATFORM
 ++++   bool
 ++++
     config BASE_FULL
        default y
        bool "Enable full-sized data structures for core" if EXPERT

diff --combined tools/perf/Makefile
index d0861bb,032ba63,032ba63,940257b,c168366..56d62d3
--- 1/tools/perf/Makefile
--- 2/tools/perf/Makefile
--- 3/tools/perf/Makefile
--- 4/tools/perf/Makefile
--- 5/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@@@@@ -52,7 -52,7 -52,7 -52,7 -52,10 +52,10 @@@@@@ ifeq ($(ARCH),i386
     endif
     ifeq ($(ARCH),x86_64)
        ARCH := x86
----    IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -xc - | tail -n 1)
++++    IS_X86_64 := 0
++++    ifeq (, $(findstring m32,$(EXTRA_CFLAGS)))
++++            IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -xc - | tail -n 1)
++++    endif
        ifeq (${IS_X86_64}, 1)
                RAW_ARCH := x86_64
                ARCH_CFLAGS := -DARCH_X86_64
@@@@@@ -279,7 -279,6 -279,6 -279,6 -282,6 +282,7 @@@@@@ LIB_H += util/thread.
     LIB_H += util/thread_map.h
     LIB_H += util/trace-event.h
     LIB_H += util/probe-finder.h
 ++++LIB_H += util/dwarf-aux.h
     LIB_H += util/probe-event.h
     LIB_H += util/pstack.h
     LIB_H += util/cpumap.h
@@@@@@ -436,7 -435,6 -435,6 -435,6 -438,6 +439,7 @@@@@@ els
        BASIC_CFLAGS += -DDWARF_SUPPORT
        EXTLIBS += -lelf -ldw
        LIB_OBJS += $(OUTPUT)util/probe-finder.o
 ++++   LIB_OBJS += $(OUTPUT)util/dwarf-aux.o
     endif # PERF_HAVE_DWARF_REGS
     endif # NO_DWARF
     
@@@@@@ -635,7 -633,7 -633,7 -633,7 -636,7 +638,7 @@@@@@ prefix_SQ = $(subst ','\'',$(prefix)
     
     SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
     
 --  LIBS = -Wl,--whole-archive $(PERFLIBS) -Wl,--no-whole-archive $(EXTLIBS)
 ++  LIBS = -Wl,--whole-archive $(PERFLIBS) -Wl,--no-whole-archive -Wl,--start-group $(EXTLIBS) -Wl,--end-group
     
     ALL_CFLAGS += $(BASIC_CFLAGS)
     ALL_CFLAGS += $(ARCH_CFLAGS)