diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-21 14:42:20 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-21 14:42:20 -0400 |
| commit | b876d08f816527af257e13d89fb0d3b4b849223c (patch) | |
| tree | 40569f568230f918ca55f04b355e251747f913ed /include/linux/init.h | |
| parent | b364776ad1208a71f0c53578c84619a395412a8d (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/pci/dmar.c
Diffstat (limited to 'include/linux/init.h')
| -rw-r--r-- | include/linux/init.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index ad63824460e3..0c1264668be0 100644 --- a/include/linux/init.h +++ b/include/linux/init.h | |||
| @@ -40,7 +40,7 @@ | |||
| 40 | 40 | ||
| 41 | /* These are for everybody (although not all archs will actually | 41 | /* These are for everybody (although not all archs will actually |
| 42 | discard it in modules) */ | 42 | discard it in modules) */ |
| 43 | #define __init __section(.init.text) __cold | 43 | #define __init __section(.init.text) __cold notrace |
| 44 | #define __initdata __section(.init.data) | 44 | #define __initdata __section(.init.data) |
| 45 | #define __initconst __section(.init.rodata) | 45 | #define __initconst __section(.init.rodata) |
| 46 | #define __exitdata __section(.exit.data) | 46 | #define __exitdata __section(.exit.data) |