diff --git a/[refs] b/[refs] index 02104c5b865a..f70e60df43ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5371ac566b6794f2125393b6850909de9e16f58 +refs/heads/master: 214541d1f30429922727040db3e2e4932ff24f46 diff --git a/trunk/include/linux/linkage.h b/trunk/include/linux/linkage.h index 6c9873f88287..ff203dd02919 100644 --- a/trunk/include/linux/linkage.h +++ b/trunk/include/linux/linkage.h @@ -34,6 +34,12 @@ name: #endif +#ifndef WEAK +#define WEAK(name) \ + .weak name; \ + name: +#endif + #define KPROBE_ENTRY(name) \ .pushsection .kprobes.text, "ax"; \ ENTRY(name)