diff options
| author | Tejun Heo <tj@kernel.org> | 2009-09-14 20:57:19 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-09-14 20:57:19 -0400 |
| commit | 5579fd7e6aed8860ea0c8e3f11897493153b10ad (patch) | |
| tree | 8f797ccd0f1a2c88f1605ae9e90b3ac17485de27 /Makefile | |
| parent | 04a13c7c632e1fe04a5f6e6c83565d2559e37598 (diff) | |
| parent | c2a7e818019f20a5cf7fb26a6eb59e212e6c0cd8 (diff) | |
Merge branch 'for-next' into for-linus
* pcpu_chunk_page_occupied() doesn't exist in for-next.
* pcpu_chunk_addr_search() updated to use raw_smp_processor_id().
Conflicts:
mm/percpu.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -325,7 +325,7 @@ CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \ | |||
| 325 | MODFLAGS = -DMODULE | 325 | MODFLAGS = -DMODULE |
| 326 | CFLAGS_MODULE = $(MODFLAGS) | 326 | CFLAGS_MODULE = $(MODFLAGS) |
| 327 | AFLAGS_MODULE = $(MODFLAGS) | 327 | AFLAGS_MODULE = $(MODFLAGS) |
| 328 | LDFLAGS_MODULE = | 328 | LDFLAGS_MODULE = -T $(srctree)/scripts/module-common.lds |
| 329 | CFLAGS_KERNEL = | 329 | CFLAGS_KERNEL = |
| 330 | AFLAGS_KERNEL = | 330 | AFLAGS_KERNEL = |
| 331 | CFLAGS_GCOV = -fprofile-arcs -ftest-coverage | 331 | CFLAGS_GCOV = -fprofile-arcs -ftest-coverage |