diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-23 13:24:10 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-23 13:24:10 -0700 |
| commit | dc4fea795bf7e3f80dbfa3a40b8ab89427e9aed5 (patch) | |
| tree | 1926c96f145965c393a2c8ab523c327dd1a241cf /arch/mips/include/asm/cpu-info.h | |
| parent | c8f2efc8f636506e0f0c2ba4035382076875f0c1 (diff) | |
| parent | 9d23108df359e572a0dca0b631bfee9f5e0fa9ea (diff) | |
| download | linux-dc4fea795bf7e3f80dbfa3a40b8ab89427e9aed5.tar.bz2 | |
Merge branch 'master' into usb-next
We have USB fixes now in Linus's tree that we need to properly sort out
with reverts and the like in the usb-next branch, so merge them together
and do it by hand.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/mips/include/asm/cpu-info.h')
| -rw-r--r-- | arch/mips/include/asm/cpu-info.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/include/asm/cpu-info.h b/arch/mips/include/asm/cpu-info.h index 41401d8eb7d1..21c8e29c8f91 100644 --- a/arch/mips/include/asm/cpu-info.h +++ b/arch/mips/include/asm/cpu-info.h @@ -84,6 +84,7 @@ struct cpuinfo_mips { extern struct cpuinfo_mips cpu_data[]; #define current_cpu_data cpu_data[smp_processor_id()] #define raw_current_cpu_data cpu_data[raw_smp_processor_id()] +#define boot_cpu_data cpu_data[0] extern void cpu_probe(void); extern void cpu_report(void); |