bench/headers.patch at master · VolkerStolz/bench · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
diff -ru linux-headers-orig/include/linux/kernel.h linux-headers/include/linux/kernel.h
--- linux-headers-orig/include/linux/kernel.h	2012-02-09 12:51:06.126344076 +0100
+++ linux-headers/include/linux/kernel.h	2012-02-09 12:51:15.322344295 +0100
@@ -660,7 +660,7 @@
 	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
 	(type *)( (char *)__mptr - offsetof(type,member) );})

-#ifdef __CHECKER__
+#ifdef __GOBLINT__
 #define BUILD_BUG_ON_NOT_POWER_OF_2(n)
 #define BUILD_BUG_ON_ZERO(e) (0)
 #define BUILD_BUG_ON_NULL(e) ((void*)0)
Only in linux-headers/include/linux: kernel.h.orig
diff -ru linux-headers-orig/include/linux/poison.h linux-headers/include/linux/poison.h
--- linux-headers-orig/include/linux/poison.h	2012-02-09 12:51:06.154344077 +0100
+++ linux-headers/include/linux/poison.h	2012-02-09 12:51:15.322344295 +0100
@@ -19,8 +19,8 @@
  * under normal circumstances, used to verify that nobody uses
  * non-initialized list entries.
  */
-#define LIST_POISON1  ((void *) 0x00100100 + POISON_POINTER_DELTA)
-#define LIST_POISON2  ((void *) 0x00200200 + POISON_POINTER_DELTA)
+#define LIST_POISON1  ((void *) 0)
+#define LIST_POISON2  ((void *) 0)

 /********** include/linux/timer.h **********/
 /*
diff -ru linux-headers-orig/include/linux/sched.h linux-headers/include/linux/sched.h
--- linux-headers-orig/include/linux/sched.h	2012-02-09 12:51:06.146344076 +0100
+++ linux-headers/include/linux/sched.h	2012-02-09 12:51:15.322344295 +0100
@@ -196,8 +196,7 @@

 #define TASK_STATE_TO_CHAR_STR "RSDTtZXxKW"

-extern char ___assert_task_state[1 - 2*!!(
-		sizeof(TASK_STATE_TO_CHAR_STR)-1 != ilog2(TASK_STATE_MAX)+1)];
+//extern char ___assert_task_state[1 - 2*!!(sizeof(TASK_STATE_TO_CHAR_STR)-1 != ilog2(TASK_STATE_MAX)+1)];

 /* Convenience macros for the sake of set_task_state */
 #define TASK_KILLABLE		(TASK_WAKEKILL | TASK_UNINTERRUPTIBLE)
Only in linux-headers/include/linux: sched.h.orig
diff -ru linux-headers-orig/include/linux/sysdev.h linux-headers/include/linux/sysdev.h
--- linux-headers-orig/include/linux/sysdev.h	2012-02-09 12:51:06.126344076 +0100
+++ linux-headers/include/linux/sysdev.h	2012-02-09 12:51:15.322344295 +0100
@@ -124,7 +124,7 @@
 static inline void
 sysdev_remove_files(struct sys_device *d, struct sysdev_attribute **a)
 {
-	return sysfs_remove_files(&d->kobj, (const struct attribute **)a);
+	sysfs_remove_files(&d->kobj, (const struct attribute **)a);
 }

 struct sysdev_ext_attribute {
Only in linux-headers/include/linux: sysdev.h.orig