diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-02-09 16:21:25 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-02-09 16:21:25 +0800 |
| commit | 1203868ffa16d93234dc005fba95b6596b87ddb5 (patch) | |
| tree | 0e24f2baa99515d0045998361a2294e2b2b25484 /arch/x86/boot/compressed/misc.h | |
| parent | 03b862ce80d27a26f8add26a547b3dc7b4d561d6 (diff) | |
| parent | 054f8fe34189a62a0b87700c062a18c3a8421615 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlsk-v3.18-17.03-androidlsk-v3.18-17.02-android
Diffstat (limited to 'arch/x86/boot/compressed/misc.h')
| -rw-r--r-- | arch/x86/boot/compressed/misc.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h index 04477d68403f..1ea2f195f41e 100644 --- a/arch/x86/boot/compressed/misc.h +++ b/arch/x86/boot/compressed/misc.h @@ -2,11 +2,13 @@ #define BOOT_COMPRESSED_MISC_H /* - * we have to be careful, because no indirections are allowed here, and - * paravirt_ops is a kind of one. As it will only run in baremetal anyway, - * we just keep it from happening + * Special hack: we have to be careful, because no indirections are allowed here, + * and paravirt_ops is a kind of one. As it will only run in baremetal anyway, + * we just keep it from happening. (This list needs to be extended when new + * paravirt and debugging variants are added.) */ #undef CONFIG_PARAVIRT +#undef CONFIG_PARAVIRT_SPINLOCKS #undef CONFIG_KASAN #ifdef CONFIG_X86_32 #define _ASM_X86_DESC_H 1 |