projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
[cascardo/linux.git]
/
arch
/
powerpc
/
kernel
/
prom.c
diff --git
a/arch/powerpc/kernel/prom.c
b/arch/powerpc/kernel/prom.c
index
a15fe1d
..
946e34f
100644
(file)
--- a/
arch/powerpc/kernel/prom.c
+++ b/
arch/powerpc/kernel/prom.c
@@
-34,6
+34,7
@@
#include <linux/of.h>
#include <linux/of_fdt.h>
#include <linux/libfdt.h>
#include <linux/of.h>
#include <linux/of_fdt.h>
#include <linux/libfdt.h>
+#include <linux/cpu.h>
#include <asm/prom.h>
#include <asm/rtas.h>
#include <asm/prom.h>
#include <asm/rtas.h>
@@
-167,6
+168,7
@@
static struct ibm_pa_feature {
*/
{CPU_FTR_TM_COMP, 0, 0,
PPC_FEATURE2_HTM_COMP|PPC_FEATURE2_HTM_NOSC_COMP, 22, 0, 0},
*/
{CPU_FTR_TM_COMP, 0, 0,
PPC_FEATURE2_HTM_COMP|PPC_FEATURE2_HTM_NOSC_COMP, 22, 0, 0},
+ {0, MMU_FTR_RADIX, 0, 0, 40, 0, 0},
};
static void __init scan_features(unsigned long node, const unsigned char *ftrs,
};
static void __init scan_features(unsigned long node, const unsigned char *ftrs,