aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/linux/compiler-gcc4.h1
-rw-r--r--include/linux/compiler.h3
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
index f1709c1f9eae..77542c57e20a 100644
--- a/include/linux/compiler-gcc4.h
+++ b/include/linux/compiler-gcc4.h
@@ -41,4 +41,5 @@
41#define __compiletime_object_size(obj) __builtin_object_size(obj, 0) 41#define __compiletime_object_size(obj) __builtin_object_size(obj, 0)
42#if __GNUC_MINOR__ >= 4 42#if __GNUC_MINOR__ >= 4
43#define __compiletime_warning(message) __attribute__((warning(message))) 43#define __compiletime_warning(message) __attribute__((warning(message)))
44#define __compiletime_error(message) __attribute__((error(message)))
44#endif 45#endif
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 950356311f12..88fd4b673cb4 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -273,6 +273,9 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
273#ifndef __compiletime_warning 273#ifndef __compiletime_warning
274# define __compiletime_warning(message) 274# define __compiletime_warning(message)
275#endif 275#endif
276#ifndef __compiletime_error
277# define __compiletime_error(message)
278#endif
276 279
277/* 280/*
278 * Prevent the compiler from merging or refetching accesses. The compiler 281 * Prevent the compiler from merging or refetching accesses. The compiler