[PATCH] net/bpf.c: Remove AUDIT_ARCH_H8300.

[PATCH] net/bpf.c: Remove AUDIT_ARCH_H8300.

[Vinson Lee]

From: Vinson Lee <vlee@twitter.com>

AUDIT_ARCH_H8300 was removed from include/uapi/linux/audit.h in Linux
3.13 commit 6f6f467eaaa0ac4fb77714d0172d65c781dabb8c.

commit 6f6f467eaaa0ac4fb77714d0172d65c781dabb8c
Author: Guenter Roeck <linux@roeck-us.net>
Date:   Fri Aug 30 06:12:40 2013 -0700

    Drop remaining references to H8/300 architecture

    With the architecture gone, any references to it are no longer needed.

    Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
    Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Guenter Roeck <linux@roeck-us.net>

This patch fixes this build error.

  CC	net/bpf.o
net/bpf.c:135:18: error: ‘AUDIT_ARCH_H8300’ undeclared here (not in a function)
  AUDIT_ARCH_FRV, AUDIT_ARCH_H8300, AUDIT_ARCH_I386, AUDIT_ARCH_IA64,
                  ^

Signed-off-by: Vinson Lee <vlee@twitter.com>
---
 net/bpf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/bpf.c b/net/bpf.c
index fc94125..198f8e1 100644
--- a/net/bpf.c
+++ b/net/bpf.c
@@ -132,7 +132,7 @@ static const uint32_t bpf_seccomp_ret_k_vars[] = {
 
 static const uint32_t bpf_seccomp_jmp_arch_vars[] = {
 	AUDIT_ARCH_ALPHA, AUDIT_ARCH_ARM, AUDIT_ARCH_ARMEB, AUDIT_ARCH_CRIS,
-	AUDIT_ARCH_FRV, AUDIT_ARCH_H8300, AUDIT_ARCH_I386, AUDIT_ARCH_IA64,
+	AUDIT_ARCH_FRV, AUDIT_ARCH_I386, AUDIT_ARCH_IA64,
 	AUDIT_ARCH_M32R, AUDIT_ARCH_M68K, AUDIT_ARCH_MIPS, AUDIT_ARCH_MIPSEL,
 	AUDIT_ARCH_MIPS64, AUDIT_ARCH_MIPSEL64, AUDIT_ARCH_PARISC,
 	AUDIT_ARCH_PARISC64, AUDIT_ARCH_PPC, AUDIT_ARCH_PPC64, AUDIT_ARCH_S390,
-- 
1.8.4.2

Re: [PATCH] net/bpf.c: Remove AUDIT_ARCH_H8300.

[Daniel Borkmann]

On 11/16/2013 02:20 AM, Vinson Lee wrote:
> From: Vinson Lee <vlee@twitter.com>
>
> AUDIT_ARCH_H8300 was removed from include/uapi/linux/audit.h in Linux
> 3.13 commit 6f6f467eaaa0ac4fb77714d0172d65c781dabb8c.
>
> commit 6f6f467eaaa0ac4fb77714d0172d65c781dabb8c
> Author: Guenter Roeck <linux@roeck-us.net>
> Date:   Fri Aug 30 06:12:40 2013 -0700
>
>      Drop remaining references to H8/300 architecture
>
>      With the architecture gone, any references to it are no longer needed.
>
>      Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
>      Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>      Signed-off-by: Guenter Roeck <linux@roeck-us.net>
>
> This patch fixes this build error.
>
>    CC	net/bpf.o
> net/bpf.c:135:18: error: ‘AUDIT_ARCH_H8300’ undeclared here (not in a function)
>    AUDIT_ARCH_FRV, AUDIT_ARCH_H8300, AUDIT_ARCH_I386, AUDIT_ARCH_IA64,
>                    ^
>
> Signed-off-by: Vinson Lee <vlee@twitter.com>

Although the elements in the array could then be rearragned, but fair enough:

Acked-by: Daniel Borkmann <dborkman@redhat.com>

Thanks !