Hi Andrew, After merging the akpm tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from arch/x86/include/asm/syscall.h:16:0, from arch/x86/kernel/signal.c:40: include/linux/audit.h: In function 'audit_get_loginuid': include/linux/audit.h:536:1: error: expected ';' before '}' token Caused by commit 57fb5bbce51d ("audit.h: replace defines with C stubs"). I have added the following patch for today: From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Date: Thu, 27 Sep 2012 17:35:06 +1000 Subject: [PATCH] audit.h: replace defines with C stubs fix Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> --- include/linux/audit.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/audit.h b/include/linux/audit.h index f1cfe02..30e9bea 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -532,7 +532,7 @@ extern int audit_set_loginuid(kuid_t loginuid); static inline kuid_t audit_get_loginuid(struct task_struct *tsk) { - return tsk->loginuid + return tsk->loginuid; } static inline int audit_get_sessionid(struct task_struct *tsk) -- 1.7.10.280.gaa39 -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgp8JGpUZUkva.pgp
Description: PGP signature