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/include/asm/feature-fixups.h | |
| 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/include/asm/feature-fixups.h')
| -rw-r--r-- | arch/powerpc/include/asm/feature-fixups.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/feature-fixups.h b/arch/powerpc/include/asm/feature-fixups.h index 57fec8ac7b92..ddf54f5bbdd1 100644 --- a/arch/powerpc/include/asm/feature-fixups.h +++ b/arch/powerpc/include/asm/feature-fixups.h | |||
| @@ -186,6 +186,7 @@ label##3: \ | |||
| 186 | 186 | ||
| 187 | #ifndef __ASSEMBLY__ | 187 | #ifndef __ASSEMBLY__ |
| 188 | void apply_feature_fixups(void); | 188 | void apply_feature_fixups(void); |
| 189 | void setup_feature_keys(void); | ||
| 189 | #endif | 190 | #endif |
| 190 | 191 | ||
| 191 | #endif /* __ASM_POWERPC_FEATURE_FIXUPS_H */ | 192 | #endif /* __ASM_POWERPC_FEATURE_FIXUPS_H */ |