2024-05-25 12:45:44

by tip-bot2 for Alexey Makhalov

Subject: [tip: locking/urgent] cleanup: Standardize the header guard define's name

The following commit has been merged into the locking/urgent branch of tip:

Commit-ID: fda570c8796f8fbb3285fb7ac007ace9aabbbb68
Gitweb: https://git.kernel.org/tip/fda570c8796f8fbb3285fb7ac007ace9aabbbb68
Author: Ingo Molnar <[email protected]>
AuthorDate: Sat, 25 May 2024 13:18:17 +02:00
Committer: Ingo Molnar <[email protected]>
CommitterDate: Sat, 25 May 2024 13:20:36 +02:00

cleanup: Standardize the header guard define's name

At some point during early development, the <linux/cleanup.h> header
must have been named <linux/guard.h>, as evidenced by the header
guard name:

#ifndef __LINUX_GUARDS_H
#define __LINUX_GUARDS_H

It ended up being <linux/cleanup.h>, but the old guard name for
a file name that was never upstream never changed.

Do that now - and while at it, also use the canonical _LINUX prefix,
instead of the less common __LINUX prefix.

Signed-off-by: Ingo Molnar <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: [email protected]
---
include/linux/cleanup.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/linux/cleanup.h b/include/linux/cleanup.h
index c2d09bc..cef68e8 100644
--- a/include/linux/cleanup.h
+++ b/include/linux/cleanup.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __LINUX_GUARDS_H
-#define __LINUX_GUARDS_H
+#ifndef _LINUX_CLEANUP_H
+#define _LINUX_CLEANUP_H

#include <linux/compiler.h>

@@ -247,4 +247,4 @@ __DEFINE_LOCK_GUARD_0(_name, _lock)
{ return class_##_name##_lock_ptr(_T); }


-#endif /* __LINUX_GUARDS_H */
+#endif /* _LINUX_CLEANUP_H */

2024-05-27 10:24:46

by tip-bot2 for Alexey Makhalov

Subject: [tip: locking/core] cleanup: Standardize the header guard define's name

The following commit has been merged into the locking/core branch of tip:

Commit-ID: c80c4490c280a1678e47d34d2a335a58f1318615
Gitweb: https://git.kernel.org/tip/c80c4490c280a1678e47d34d2a335a58f1318615
Author: Ingo Molnar <[email protected]>
AuthorDate: Sat, 25 May 2024 12:45:31
Committer: Ingo Molnar <[email protected]>
CommitterDate: Mon, 27 May 2024 12:19:55 +02:00

cleanup: Standardize the header guard define's name

At some point during early development, the <linux/cleanup.h> header
must have been named <linux/guard.h>, as evidenced by the header
guard name:

#ifndef __LINUX_GUARDS_H
#define __LINUX_GUARDS_H

It ended up being <linux/cleanup.h>, but the old guard name for
a file name that was never upstream never changed.

Do that now - and while at it, also use the canonical _LINUX prefix,
instead of the less common __LINUX prefix.

Signed-off-by: Ingo Molnar <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Link: https://lore.kernel.org/r/171664113181.10875.8784434350512348496.tip-bot2@tip-bot2
---
include/linux/cleanup.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/linux/cleanup.h b/include/linux/cleanup.h
index c2d09bc..cef68e8 100644
--- a/include/linux/cleanup.h
+++ b/include/linux/cleanup.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __LINUX_GUARDS_H
-#define __LINUX_GUARDS_H
+#ifndef _LINUX_CLEANUP_H
+#define _LINUX_CLEANUP_H

#include <linux/compiler.h>

@@ -247,4 +247,4 @@ __DEFINE_LOCK_GUARD_0(_name, _lock)
{ return class_##_name##_lock_ptr(_T); }


-#endif /* __LINUX_GUARDS_H */
+#endif /* _LINUX_CLEANUP_H */