linux-mips
[Top] [All Lists]

[PATCH] MIPS: Fix include guard macro in uapi/asm/fcntl.h

To: ralf@linux-mips.org, linux-mips@linux-mips.org
Subject: [PATCH] MIPS: Fix include guard macro in uapi/asm/fcntl.h
From: "Jayachandran C" <jchandra@broadcom.com>
Date: Sun, 16 Jun 2013 01:58:44 +0530
Cc: "Jayachandran C" <jchandra@broadcom.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
The commit d7f15bb42274a12ac95c237d6d9cb46b691881fa
"MIPS: <uapi/asm/fcntl.h>: Don't reference CONFIG_* symbols."
in linux-mips.org master, causes userspace to break: 

udevd[324]: error getting socket: Invalid argument
udevd[324]: error initializing udev control socket

This is because the include guard in asm/fcntl.h is the same as the one
in uapi/asm/fcntl.h Fix the issue by using _UAPI_ASM_FCNTL_H as include
guard in the uapi file.

Signed-off-by: Jayachandran C <jchandra@broadcom.com>
---
[ I don't see the same commit in kernel.org git. If the patch are not
 yet sent upstream - then this change can be merged to the commit
 d7f15bb]


 arch/mips/include/uapi/asm/fcntl.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/mips/include/uapi/asm/fcntl.h 
b/arch/mips/include/uapi/asm/fcntl.h
index 898b953..97e56a5 100644
--- a/arch/mips/include/uapi/asm/fcntl.h
+++ b/arch/mips/include/uapi/asm/fcntl.h
@@ -5,8 +5,8 @@
  *
  * Copyright (C) 1995, 96, 97, 98, 99, 2003, 05 Ralf Baechle
  */
-#ifndef _ASM_FCNTL_H
-#define _ASM_FCNTL_H
+#ifndef _UAPI_ASM_FCNTL_H
+#define _UAPI_ASM_FCNTL_H
 
 
 #define O_APPEND       0x0008
@@ -50,4 +50,4 @@
 
 #include <asm-generic/fcntl.h>
 
-#endif /* _ASM_FCNTL_H */
+#endif /* _UAPI_ASM_FCNTL_H */
-- 
1.7.9.5



<Prev in Thread] Current Thread [Next in Thread>