[PATCH] kdbus: fix header guard name

[PATCH] kdbus: fix header guard name

[lucas.de.marchi]

From: Lucas De Marchi <lucas.demarchi@intel.com>

UAPI headers have a _UAPI_ as prefix, which is removed during
headers_install. If it's put as a suffix it will not be removed and will
be the only header with UAPI in the header guard macro.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 include/uapi/linux/kdbus.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/uapi/linux/kdbus.h b/include/uapi/linux/kdbus.h
index fc1d77d..302862f 100644
--- a/include/uapi/linux/kdbus.h
+++ b/include/uapi/linux/kdbus.h
@@ -5,8 +5,8 @@
  * your option) any later version.
  */
 
-#ifndef _KDBUS_UAPI_H_
-#define _KDBUS_UAPI_H_
+#ifndef _UAPI_KDBUS_H_
+#define _UAPI_KDBUS_H_
 
 #include <linux/ioctl.h>
 #include <linux/types.h>
-- 
2.3.3

Re: [PATCH] kdbus: fix header guard name

[David Herrmann]

Hi

On Tue, Mar 17, 2015 at 4:03 AM,  <lucas.de.marchi@gmail.com> wrote:
> From: Lucas De Marchi <lucas.demarchi@intel.com>
>
> UAPI headers have a _UAPI_ as prefix, which is removed during
> headers_install. If it's put as a suffix it will not be removed and will
> be the only header with UAPI in the header guard macro.
>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> ---
>  include/uapi/linux/kdbus.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/uapi/linux/kdbus.h b/include/uapi/linux/kdbus.h
> index fc1d77d..302862f 100644
> --- a/include/uapi/linux/kdbus.h
> +++ b/include/uapi/linux/kdbus.h
> @@ -5,8 +5,8 @@
>   * your option) any later version.
>   */
>
> -#ifndef _KDBUS_UAPI_H_
> -#define _KDBUS_UAPI_H_
> +#ifndef _UAPI_KDBUS_H_
> +#define _UAPI_KDBUS_H_

Looks good, but lacks an update of the last line in this header:

#endif /* _KDBUS_UAPI_H_ */

With this comment changed:

Reviewed-by: David Herrmann <dh.herrmann@gmail.com>

Thanks
David!

>  #include <linux/ioctl.h>
>  #include <linux/types.h>
> --
> 2.3.3
>

[PATCH] kdbus: fix header guard name

[lucas.de.marchi]

From: Lucas De Marchi <lucas.demarchi@intel.com>

UAPI headers have a _UAPI_ as prefix, which is removed during
headers_install. If it's put as a suffix it will not be removed and will
be the only header with UAPI in the header guard macro.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
---
 include/uapi/linux/kdbus.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/uapi/linux/kdbus.h b/include/uapi/linux/kdbus.h
index fc1d77d..2fe0a1c 100644
--- a/include/uapi/linux/kdbus.h
+++ b/include/uapi/linux/kdbus.h
@@ -5,8 +5,8 @@
  * your option) any later version.
  */
 
-#ifndef _KDBUS_UAPI_H_
-#define _KDBUS_UAPI_H_
+#ifndef _UAPI_KDBUS_H_
+#define _UAPI_KDBUS_H_
 
 #include <linux/ioctl.h>
 #include <linux/types.h>
@@ -976,4 +976,4 @@ enum kdbus_ioctl_type {
 					     struct kdbus_cmd_match),
 };
 
-#endif /* _KDBUS_UAPI_H_ */
+#endif /* _UAPI_KDBUS_H_ */
-- 
2.3.3

Re: [PATCH] kdbus: fix header guard name

[Greg Kroah-Hartman]

On Tue, Mar 17, 2015 at 09:21:42AM -0300, lucas.de.marchi@gmail.com wrote:
> From: Lucas De Marchi <lucas.demarchi@intel.com>
> 
> UAPI headers have a _UAPI_ as prefix, which is removed during
> headers_install. If it's put as a suffix it will not be removed and will
> be the only header with UAPI in the header guard macro.
> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
> ---
>  include/uapi/linux/kdbus.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Applied, thanks.

greg k-h