diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /arch/powerpc/kernel/setup_64.c | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'arch/powerpc/kernel/setup_64.c')
| -rw-r--r-- | arch/powerpc/kernel/setup_64.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index eafb9a79e011..7ac8e6eaab5b 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c | |||
| @@ -300,6 +300,7 @@ void __init early_setup(unsigned long dt_ptr) | |||
| 300 | 300 | ||
| 301 | /* Apply all the dynamic patching */ | 301 | /* Apply all the dynamic patching */ |
| 302 | apply_feature_fixups(); | 302 | apply_feature_fixups(); |
| 303 | setup_feature_keys(); | ||
| 303 | 304 | ||
| 304 | /* Initialize the hash table or TLB handling */ | 305 | /* Initialize the hash table or TLB handling */ |
| 305 | early_init_mmu(); | 306 | early_init_mmu(); |