From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Fri, 12 Jun 2009 06:53:38 +0000 (+1000)
Subject: Merge commit 'origin/master' into next
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=bc47ab0241c7c86da4f5e5f82fbca7d45387c18d;p=openwrt%2Fstaging%2Fblogic.git

Merge commit 'origin/master' into next

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

bc47ab0241c7c86da4f5e5f82fbca7d45387c18d
diff --cc arch/powerpc/kernel/asm-offsets.c
index ce90c570cd8e,e981d1ce1914..561b64652311
--- a/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(PACAPERFPEND, offsetof(struct paca_struct, perf_counter_pending));
 -	DEFINE(PACASLBCACHE, offsetof(struct paca_struct, slb_cache));
 -	DEFINE(PACASLBCACHEPTR, offsetof(struct paca_struct, slb_cache_ptr));
  	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 8564a412e7a6,844d3f882a15..f7f376ea7b17
--- a/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