Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2249ca9d60d3a8a1f6f223f0f0a0283fcb7ce33e

Authored by Paul Mackerras
1 parent dcad47fc42
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

powerpc: Various UP build fixes 

Mostly this involves adding #include <asm/smp.h>, since that defines
things like boot_cpuid[_phys] and [gs]et_hard_smp_processor_id, which
are SMP-related but still needed on UP.  This incorporates fixes
posted by Olof Johansson and Heikki Lindholm.

Signed-off-by: Paul Mackerras <paulus@samba.org>

Showing 11 changed files with 12 additions and 7 deletions Side-by-side Diff

arch/powerpc/kernel/rtas.c
Diff comments   View file @ 2249ca9
... ... @@ -608,7 +608,6 @@
608 608 return 0;
609 609 }
610 610  
611   -#ifdef CONFIG_SMP
612 611 /* This version can't take the spinlock, because it never returns */
613 612  
614 613 struct rtas_args rtas_stop_self_args = {
... ... @@ -633,7 +632,6 @@
633 632  
634 633 panic("Alas, I survived.\n");
635 634 }
636   -#endif
637 635  
638 636 /*
639 637 * Call early during boot, before mem init or bootmem, to retreive the RTAS
arch/powerpc/kernel/time.c
Diff comments   View file @ 2249ca9
... ... @@ -61,6 +61,7 @@
61 61 #include <asm/prom.h>
62 62 #include <asm/irq.h>
63 63 #include <asm/div64.h>
  64 +#include <asm/smp.h>
64 65 #ifdef CONFIG_PPC64
65 66 #include <asm/systemcfg.h>
66 67 #include <asm/firmware.h>
... ... @@ -117,10 +118,6 @@
117 118  
118 119 unsigned long ppc_proc_freq;
119 120 unsigned long ppc_tb_freq;
120   -
121   -#ifdef CONFIG_PPC32 /* XXX for now */
122   -#define boot_cpuid 0
123   -#endif
124 121  
125 122 u64 tb_last_jiffy __cacheline_aligned_in_smp;
126 123 unsigned long tb_last_stamp;
arch/powerpc/lib/locks.c
Diff comments   View file @ 2249ca9
... ... @@ -23,6 +23,7 @@
23 23 #if defined(CONFIG_PPC_SPLPAR) || defined(CONFIG_PPC_ISERIES)
24 24 #include <asm/hvcall.h>
25 25 #include <asm/iseries/hv_call.h>
  26 +#include <asm/smp.h>
26 27  
27 28 void __spin_yield(raw_spinlock_t *lock)
28 29 {
arch/powerpc/mm/numa.c
Diff comments   View file @ 2249ca9
... ... @@ -21,6 +21,7 @@
21 21 #include <asm/machdep.h>
22 22 #include <asm/abs_addr.h>
23 23 #include <asm/system.h>
  24 +#include <asm/smp.h>
24 25  
25 26 static int numa_enabled = 1;
26 27  
arch/powerpc/platforms/pseries/iommu.c
Diff comments   View file @ 2249ca9
... ... @@ -46,6 +46,7 @@
46 46 #include <asm/firmware.h>
47 47 #include <asm/tce.h>
48 48 #include <asm/ppc-pci.h>
  49 +#include <asm/udbg.h>
49 50  
50 51 #include "plpar_wrappers.h"
51 52  
arch/powerpc/platforms/pseries/lpar.c
Diff comments   View file @ 2249ca9
... ... @@ -38,6 +38,7 @@
38 38 #include <asm/abs_addr.h>
39 39 #include <asm/cputable.h>
40 40 #include <asm/udbg.h>
  41 +#include <asm/smp.h>
41 42  
42 43 #include "plpar_wrappers.h"
43 44  
arch/powerpc/platforms/pseries/setup.c
Diff comments   View file @ 2249ca9
... ... @@ -65,6 +65,7 @@
65 65 #include <asm/ppc-pci.h>
66 66 #include <asm/i8259.h>
67 67 #include <asm/udbg.h>
  68 +#include <asm/smp.h>
68 69  
69 70 #include "plpar_wrappers.h"
70 71  
arch/ppc64/kernel/idle.c
Diff comments   View file @ 2249ca9
... ... @@ -28,6 +28,7 @@
28 28 #include <asm/time.h>
29 29 #include <asm/systemcfg.h>
30 30 #include <asm/machdep.h>
  31 +#include <asm/smp.h>
31 32  
32 33 extern void power4_idle(void);
33 34  
arch/ppc64/kernel/machine_kexec.c
Diff comments   View file @ 2249ca9
... ... @@ -24,6 +24,7 @@
24 24 #include <asm/mmu.h>
25 25 #include <asm/sections.h> /* _end */
26 26 #include <asm/prom.h>
  27 +#include <asm/smp.h>
27 28  
28 29 #define HASH_GROUP_SIZE 0x80 /* size of each hash group, asm/mmu.h */
29 30  
arch/ppc64/kernel/sysfs.c
Diff comments   View file @ 2249ca9
... ... @@ -20,6 +20,7 @@
20 20 #include <asm/paca.h>
21 21 #include <asm/lppaca.h>
22 22 #include <asm/machdep.h>
  23 +#include <asm/smp.h>
23 24  
24 25 static DEFINE_PER_CPU(struct cpu, cpu_devices);
25 26  
include/asm-powerpc/smp.h
Diff comments   View file @ 2249ca9
... ... @@ -86,7 +86,6 @@
86 86 #else
87 87 /* for UP */
88 88 #define smp_setup_cpu_maps()
89   -#define smp_release_cpus()
90 89  
91 90 #endif /* CONFIG_SMP */
92 91  
... ... @@ -94,6 +93,9 @@
94 93 #define get_hard_smp_processor_id(CPU) (paca[(CPU)].hw_cpu_id)
95 94 #define set_hard_smp_processor_id(CPU, VAL) \
96 95 do { (paca[(CPU)].hw_cpu_id = (VAL)); } while (0)
  96 +
  97 +extern void smp_release_cpus(void);
  98 +
97 99 #else
98 100 /* 32-bit */
99 101 #ifndef CONFIG_SMP