projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b04be7 4d58bbc)
Pull pvops into release branch
authorTony Luck <tony.luck@intel.com>
Thu, 17 Jul 2008 17:53:37 +0000 (10:53 -0700)
committerTony Luck <tony.luck@intel.com>
Thu, 17 Jul 2008 17:53:37 +0000 (10:53 -0700)
1  2 
arch/ia64/Makefile patch | diff1 | diff2 | blob | history
arch/ia64/kernel/iosapic.c patch | diff1 | diff2 | blob | history
arch/ia64/kernel/setup.c patch | diff1 | diff2 | blob | history
arch/ia64/kernel/smpboot.c patch | diff1 | diff2 | blob | history
arch/ia64/kernel/time.c patch | diff1 | diff2 | blob | history
include/asm-ia64/smp.h patch | diff1 | diff2 | blob | history

diff --cc arch/ia64/Makefile
Simple merge
diff --cc arch/ia64/kernel/iosapic.c
Simple merge
diff --cc arch/ia64/kernel/setup.c
Simple merge
diff --cc arch/ia64/kernel/smpboot.c
Simple merge
diff --cc arch/ia64/kernel/time.c
Simple merge
diff --cc include/asm-ia64/smp.h
index 27731e032ee999be767993dbdb47b8c3a7334086,2984e262fc6c2e3b1e18d201d8cd296ce2b5c918..12d96e0cd5134d9d95e01e6714b5b75179dcfcf7
--- 1/include/asm-ia64/smp.h
--- 2/include/asm-ia64/smp.h
+++ b/include/asm-ia64/smp.h
@@@ -120,7 -124,10 +121,8 @@@ extern void __init smp_build_cpu_map(vo
  extern void __init init_smp_config (void);
  extern void smp_do_timer (struct pt_regs *regs);
  
+ extern irqreturn_t handle_IPI(int irq, void *dev_id);
  extern void smp_send_reschedule (int cpu);
 -extern void lock_ipi_calllock(void);
 -extern void unlock_ipi_calllock(void);
  extern void identify_siblings (struct cpuinfo_ia64 *);
  extern int is_multithreading_enabled(void);