diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-10-14 11:01:08 +0200 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-10-14 11:01:08 +0200 |
| commit | ac5ad2a19b7c3ffa766309c5ef3de0c79fa076c4 (patch) | |
| tree | 897cd35d5da5f71410aeb7525846790537ee6697 /arch | |
| parent | 50e2778ee890c3e0b7f2e9c876d85aa962abc997 (diff) | |
| parent | 24e842ae6cb8179126246ebcbfc477b36a7b8719 (diff) | |
| download | kernel_samsung_crespo-ac5ad2a19b7c3ffa766309c5ef3de0c79fa076c4.zip kernel_samsung_crespo-ac5ad2a19b7c3ffa766309c5ef3de0c79fa076c4.tar.gz kernel_samsung_crespo-ac5ad2a19b7c3ffa766309c5ef3de0c79fa076c4.tar.bz2 | |
Merge commit '24e842a' into HEAD
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/alternative.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index dfabea4..4c734e6 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -161,7 +161,7 @@ static const unsigned char * const k7_nops[ASM_NOP_MAX+2] = #endif #ifdef P6_NOP1 -static const unsigned char __initconst_or_module p6nops[] = +static const unsigned char p6nops[] = { P6_NOP1, P6_NOP2, |