Merge commit 'origin/master' into next

Manual merge of:
	arch/powerpc/kernel/asm-offsets.c

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/powerpc/include/asm/paca.h
Simple merge

diff --cc arch/powerpc/kernel/Makefile
Simple merge

diff --cc arch/powerpc/kernel/asm-offsets.c
index ce90c57,e981d1c..561b646
--- 1/arch/powerpc/kernel/asm-offsets.c
--- 2/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@@ -129,7 -131,11 +129,8 @@@ int main(void
        DEFINE(PACAKMSR, offsetof(struct paca_struct, kernel_msr));
        DEFINE(PACASOFTIRQEN, offsetof(struct paca_struct, soft_enabled));
        DEFINE(PACAHARDIRQEN, offsetof(struct paca_struct, hard_enabled));
 -      DEFINE(PACASLBCACHE, offsetof(struct paca_struct, slb_cache));
 -      DEFINE(PACASLBCACHEPTR, offsetof(struct paca_struct, slb_cache_ptr));
+       DEFINE(PACAPERFPEND, offsetof(struct paca_struct, perf_counter_pending));
        DEFINE(PACACONTEXTID, offsetof(struct paca_struct, context.id));
 -      DEFINE(PACAVMALLOCSLLP, offsetof(struct paca_struct, vmalloc_sllp));
  #ifdef CONFIG_PPC_MM_SLICES
        DEFINE(PACALOWSLICESPSIZE, offsetof(struct paca_struct,
                                            context.low_slices_psize));

diff --cc arch/powerpc/kernel/irq.c
index 8564a41,844d3f8..f7f376e
--- 1/arch/powerpc/kernel/irq.c
--- 2/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@@ -135,8 -135,12 +136,13 @@@ notrace void raw_local_irq_restore(unsi
                if (local_paca->lppaca_ptr->int_dword.any_int)
                        iseries_handle_interrupts();
        }
 +#endif /* CONFIG_PPC_STD_MMU_64 */
  
+       if (test_perf_counter_pending()) {
+               clear_perf_counter_pending();
+               perf_counter_do_pending();
+       }
+ 
        /*
         * if (get_paca()->hard_enabled) return;
         * But again we need to take care that gcc gets hard_enabled directly

diff --cc arch/powerpc/platforms/Kconfig.cputype
Simple merge

diff --cc arch/powerpc/sysdev/mpic.c
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge