OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'locks-v3.15-2' of git://git.samba.org/jlayton/linux
[android-x86/kernel.git]
/
kernel
/
ksysfs.c
diff --git
a/kernel/ksysfs.c
b/kernel/ksysfs.c
index
e660964
..
2495a9b
100644
(file)
--- a/
kernel/ksysfs.c
+++ b/
kernel/ksysfs.c
@@
-18,6
+18,7
@@
#include <linux/stat.h>
#include <linux/sched.h>
#include <linux/capability.h>
#include <linux/stat.h>
#include <linux/sched.h>
#include <linux/capability.h>
+#include <linux/compiler.h>
#include <linux/rcupdate.h> /* rcu_expedited */
#include <linux/rcupdate.h> /* rcu_expedited */
@@
-162,8
+163,8
@@
KERNEL_ATTR_RW(rcu_expedited);
/*
* Make /sys/kernel/notes give the raw contents of our kernel .notes section.
*/
/*
* Make /sys/kernel/notes give the raw contents of our kernel .notes section.
*/
-extern const void __start_notes __
attribute__((weak))
;
-extern const void __stop_notes __
attribute__((weak))
;
+extern const void __start_notes __
weak
;
+extern const void __stop_notes __
weak
;
#define notes_size (&__stop_notes - &__start_notes)
static ssize_t notes_read(struct file *filp, struct kobject *kobj,
#define notes_size (&__stop_notes - &__start_notes)
static ssize_t notes_read(struct file *filp, struct kobject *kobj,