diff options
| author |   James Morris <jmorris@namei.org> | 2009-07-14 00:30:40 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-07-14 00:30:40 +1000 |
| commit | 7d45ecafb6792ca68da9517969d37d910601845f (patch) | |
| tree | a98b1074e5577e66a97963745f975404d0aac266 /include/linux/init_task.h | |
| parent | Revert "SELinux: Convert avc_audit to use lsm_audit.h" (diff) | |
| parent | Merge branch 'kmemleak' of git://linux-arm.org/linux-2.6 (diff) | |
Merge branch 'master' into next
Conflicts:
include/linux/personality.h
Use Linus' version.
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'include/linux/init_task.h')
| -rw-r--r-- | include/linux/init_task.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 5368fbdc7801..7fc01b13be43 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h @@ -183,5 +183,8 @@ extern struct cred init_cred; LIST_HEAD_INIT(cpu_timers[2]), \ } +/* Attach to the init_task data structure for proper alignment */ +#define __init_task_data __attribute__((__section__(".data.init_task"))) + #endif |