Skip to contentSkip to conversation

asm/generic: fix bug - kernel fails to build when enable some common audit code on Blackfin

PATCH In review Bryan Wu 4 participants 4 messages Nov 18, 2008 – Nov 19, 2008

Subsystems (2)
Generic include/asm header files Audit
lore
Share & tools
lore

Bryan Wu

author
#0 lore raw

PATCH 1/1 asm/generic: fix bug - kernel fails to build when enable some common audit code on Blackfin

From: Mike Frysinger <[email protected]>

If you enable some common audit code, the kernel fails to build.

In file included from lib/audit.c:17:
include/asm-generic/audit_write.h:3: error: '__NR_swapon' undeclared here (not in a function) make[1]: *** [lib/audit.o] Error 1
make: *** [lib] Error 2

So do not use __NR_swapon if it isnt defined for a port.

Signed-off-by Mike Frysinger <[email protected]>
Signed-off-by Bryan Wu <[email protected]>
---
 include/asm-generic/audit_write.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
include/asm-generic/audit_write.h +2 -0
index f10d367..c5f1c2c 100644
@@ -1,6 +1,8 @@
 #include <asm-generic/audit_dir_write.h>
 __NR_acct,
+#ifdef __NR_swapon
 __NR_swapon,
+#endif
 __NR_quotactl,
 __NR_truncate,
 #ifdef __NR_truncate64
Signature · 1 line
1.5.6.3
#1 lore raw
Quoted 22 lines · On Tue, 18 Nov 2008 15:03:49 +0800 Bryan Wu <[email protected]> wrote:

From: Mike Frysinger <[email protected]>

If you enable some common audit code, the kernel fails to build.

In file included from lib/audit.c:17:
include/asm-generic/audit_write.h:3: error: '__NR_swapon' undeclared here (not in a function) make[1]: *** [lib/audit.o] Error 1
make: *** [lib] Error 2

So do not use __NR_swapon if it isnt defined for a port.

Signed-off-by Mike Frysinger <[email protected]>
Signed-off-by Bryan Wu <[email protected]>
---
 include/asm-generic/audit_write.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
include/asm-generic/audit_write.h +0 -0
index f10d367..c5f1c2c 100644

include/asm-generic/audit_write.h line 8

Quoted 8 lines
include/asm-generic/audit_write.h +2 -0
@@ -1,6 +1,8 @@
 #include <asm-generic/audit_dir_write.h>
 __NR_acct,
+#ifdef __NR_swapon
 __NR_swapon,
+#endif
 __NR_quotactl,
 __NR_truncate,
 #ifdef __NR_truncate64

hrm.

Should blackfin define __NR_swapon instead? afacit include/asm/unistd.h is an exported-to-userspace header, so the architecture should export __NR_swapon to prevent userspace build failures?

#2 lore raw
Quoted 12 lines · Andrew Morton

include/asm-generic/audit_write.h line 8

Quoted 9 lines
include/asm-generic/audit_write.h +2 -0
@@ -1,6 +1,8 @@
 #include <asm-generic/audit_dir_write.h>
 __NR_acct,
+#ifdef __NR_swapon
 __NR_swapon,
+#endif
 __NR_quotactl,
 __NR_truncate,
 #ifdef __NR_truncate64

hrm.

Quoted 4 lines

Should blackfin define __NR_swapon instead? afacit include/asm/unistd.h is an exported-to-userspace header, so the architecture should export __NR_swapon to prevent userspace build failures?

Not in the absense of syscall in question. Patch applied, will push the tree tomorrow.

#3 lore raw
In reply to Andrew Morton
Quoted 33 lines · Andrew Morton
Quoted 21 lines · On Tue, 18 Nov 2008 15:03:49 +0800 Bryan Wu wrote:

From: Mike Frysinger <[email protected]>
If you enable some common audit code, the kernel fails to build.

In file included from lib/audit.c:17:
include/asm-generic/audit_write.h:3: error: '__NR_swapon' undeclared here (not in a function) make[1]: *** [lib/audit.o] Error 1
make: *** [lib] Error 2

So do not use __NR_swapon if it isnt defined for a port.

Signed-off-by Mike Frysinger <[email protected]>
Signed-off-by Bryan Wu <[email protected]>
---
 include/asm-generic/audit_write.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
include/asm-generic/audit_write.h +0 -0
index f10d367..c5f1c2c 100644

include/asm-generic/audit_write.h line 8

Quoted 8 lines
include/asm-generic/audit_write.h +2 -0
@@ -1,6 +1,8 @@
 #include <asm-generic/audit_dir_write.h>
 __NR_acct,
+#ifdef __NR_swapon
 __NR_swapon,
+#endif
 __NR_quotactl,
 __NR_truncate,
 #ifdef __NR_truncate64

hrm.

Quoted 4 lines

Should blackfin define __NR_swapon instead? afacit include/asm/unistd.h is an exported-to-userspace header, so the architecture should export __NR_swapon to prevent userspace build failures?

i dont think ports should be forced to define syscalls they dont support. no-mmu cant do swap, so Blackfin doesnt define it ... -mike