diff options
Diffstat (limited to 'kernel/module.c')
| -rw-r--r-- | kernel/module.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/module.c b/kernel/module.c index 46580edff0cb..05ce49ced8f6 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
| @@ -369,7 +369,7 @@ EXPORT_SYMBOL_GPL(find_module); | |||
| 369 | 369 | ||
| 370 | #ifdef CONFIG_SMP | 370 | #ifdef CONFIG_SMP |
| 371 | 371 | ||
| 372 | #ifdef CONFIG_HAVE_DYNAMIC_PER_CPU_AREA | 372 | #ifndef CONFIG_HAVE_LEGACY_PER_CPU_AREA |
| 373 | 373 | ||
| 374 | static void *percpu_modalloc(unsigned long size, unsigned long align, | 374 | static void *percpu_modalloc(unsigned long size, unsigned long align, |
| 375 | const char *name) | 375 | const char *name) |
| @@ -394,7 +394,7 @@ static void percpu_modfree(void *freeme) | |||
| 394 | free_percpu(freeme); | 394 | free_percpu(freeme); |
| 395 | } | 395 | } |
| 396 | 396 | ||
| 397 | #else /* ... !CONFIG_HAVE_DYNAMIC_PER_CPU_AREA */ | 397 | #else /* ... CONFIG_HAVE_LEGACY_PER_CPU_AREA */ |
| 398 | 398 | ||
| 399 | /* Number of blocks used and allocated. */ | 399 | /* Number of blocks used and allocated. */ |
| 400 | static unsigned int pcpu_num_used, pcpu_num_allocated; | 400 | static unsigned int pcpu_num_used, pcpu_num_allocated; |
| @@ -540,7 +540,7 @@ static int percpu_modinit(void) | |||
| 540 | } | 540 | } |
| 541 | __initcall(percpu_modinit); | 541 | __initcall(percpu_modinit); |
| 542 | 542 | ||
| 543 | #endif /* CONFIG_HAVE_DYNAMIC_PER_CPU_AREA */ | 543 | #endif /* CONFIG_HAVE_LEGACY_PER_CPU_AREA */ |
| 544 | 544 | ||
| 545 | static unsigned int find_pcpusec(Elf_Ehdr *hdr, | 545 | static unsigned int find_pcpusec(Elf_Ehdr *hdr, |
| 546 | Elf_Shdr *sechdrs, | 546 | Elf_Shdr *sechdrs, |
