diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-19 07:55:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-19 07:55:08 -0800 |
| commit | 7a684c452e2589f3ddd7e2d466b4f747d3715ad9 (patch) | |
| tree | fed803e7450770993575b37807ba2195eafd5b0e /include/linux/compiler-gcc4.h | |
| parent | Merge tag 'byteswap-for-linus-20121219' of git://git.infradead.org/users/dwmw2/byteswap (diff) | |
| parent | MODSIGN: Fix kbuild output when using default extra_certificates (diff) | |
| download | linux-dev-7a684c452e2589f3ddd7e2d466b4f747d3715ad9.tar.xz linux-dev-7a684c452e2589f3ddd7e2d466b4f747d3715ad9.zip | |
Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull module update from Rusty Russell:
"Nothing all that exciting; a new module-from-fd syscall for those who
want to verify the source of the module (ChromeOS) and/or use standard
IMA on it or other security hooks."
* tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
MODSIGN: Fix kbuild output when using default extra_certificates
MODSIGN: Avoid using .incbin in C source
modules: don't hand 0 to vmalloc.
module: Remove a extra null character at the top of module->strtab.
ASN.1: Use the ASN1_LONG_TAG and ASN1_INDEFINITE_LENGTH constants
ASN.1: Define indefinite length marker constant
moduleparam: use __UNIQUE_ID()
__UNIQUE_ID()
MODSIGN: Add modules_sign make target
powerpc: add finit_module syscall.
ima: support new kernel module syscall
add finit_module syscall to asm-generic
ARM: add finit_module syscall to ARM
security: introduce kernel_module_from_file hook
module: add flags arg to sys_finit_module()
module: add syscall to load module from fd
Diffstat (limited to 'include/linux/compiler-gcc4.h')
| -rw-r--r-- | include/linux/compiler-gcc4.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h index dc16a858e77c..662fd1b4c42a 100644 --- a/include/linux/compiler-gcc4.h +++ b/include/linux/compiler-gcc4.h @@ -31,6 +31,8 @@ #define __linktime_error(message) __attribute__((__error__(message))) +#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) + #if __GNUC_MINOR__ >= 5 /* * Mark a position in code as unreachable. This can be used to |