Signed-off-by: Choi Gi-yong <y...@gnoy.org>
---
mm/percpu.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/mm/percpu.c b/mm/percpu.c
index 036cfe0..6528ffa 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -72,7 +72,7 @@
#include <asm/cacheflush.h>
#include <asm/sections.h>
#include <asm/tlbflush.h>
-#include <asm/io.h>
+#include <linux/io.h>
#define PCPU_SLOT_BASE_SHIFT 5 /* 1-31 shares the same slot */
#define PCPU_DFL_MAP_ALLOC 16 /* start a map with 16 ents */
@@ -715,7 +715,7 @@ static void __percpu *pcpu_alloc(size_t size, size_t align,
bool reserved)
if (unlikely(!size || size > PCPU_MIN_UNIT_SIZE || align > PAGE_SIZE)) {
WARN(true, "illegal size (%zu) or align (%zu) for "
- "percpu allocation\n", size, align);
+ "percpu allocation\n", size, align);
return NULL;
}
@@ -968,8 +968,8 @@ bool is_kernel_percpu_address(unsigned long addr)
void *start = per_cpu_ptr(base, cpu);
if ((void *)addr >= start && (void *)addr < start + static_size)
- return true;
- }
+ return true;
+ }
#endif
/* on UP, can't distinguish from other static vars, always false */
return false;
@@ -1929,8 +1929,7 @@ void __init setup_per_cpu_areas(void)
*/
void __init percpu_init_late(void)
{
- struct pcpu_chunk *target_chunks[] =
- { pcpu_first_chunk, pcpu_reserved_chunk, NULL };
+ struct pcpu_chunk *target_chunks[] = { pcpu_first_chunk,
pcpu_reserved_chunk, NULL };
struct pcpu_chunk *chunk;
unsigned long flags;
int i;
--
1.8.3.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
