Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (33 commits)
  xtensa: use DATA_DATA in xtensa
  powerpc: add missing DATA_DATA to powerpc
  cris: use DATA_DATA in cris
  kallsyms: remove usage of memmem and _GNU_SOURCE from scripts/kallsyms.c
  kbuild: use -fno-optimize-sibling-calls unconditionally
  kconfig: reset generated values only if Kconfig and .config agree.
  kbuild: fix the warning when running make tags
  kconfig: strip 'CONFIG_' automatically in kernel configuration search
  kbuild: use POSIX BRE in headers install target
  Whitelist references from __dbe_table to .init
  modpost white list pattern adjustment
  kbuild: do section mismatch check on full vmlinux
  kbuild: whitelist references from variables named _timer to .init.text
  kbuild: remove hardcoded _logo names from modpost
  kbuild: remove hardcoded apic_es7000 from modpost
  kbuild: warn about references from .init.text to .exit.text
  kbuild: consolidate section checks
  kbuild: refactor code in modpost to improve maintainability
  kbuild: ignore section mismatch warnings originating from .note section
  kbuild: .paravirtprobe section is obsolete, so modpost doesn't need to handle it
  ...

1 files changed, 7 insertions, 7 deletions

diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
index f98d772aac80..53dae3eb3d1f 100644
--- a/scripts/Makefile.headersinst
+++ b/scripts/Makefile.headersinst
@@ -11,13 +11,13 @@ UNIFDEF := scripts/unifdef -U__KERNEL__
 
 # Eliminate the contents of (and inclusions of) compiler.h
 HDRSED  := sed  -e "s/ inline / __inline__ /g" \
-                -e "s/[[:space:]]__user[[:space:]]\+/ /g" \
-                -e "s/(__user[[:space:]]\+/ (/g" \
-                -e "s/[[:space:]]__force[[:space:]]\+/ /g" \
-                -e "s/(__force[[:space:]]\+/ (/g" \
-                -e "s/[[:space:]]__iomem[[:space:]]\+/ /g" \
-                -e "s/(__iomem[[:space:]]\+/ (/g" \
-                -e "s/[[:space:]]__attribute_const__[[:space:]]\+/\ /g" \
+                -e "s/[[:space:]]__user[[:space:]]\{1,\}/ /g" \
+                -e "s/(__user[[:space:]]\{1,\}/ (/g" \
+                -e "s/[[:space:]]__force[[:space:]]\{1,\}/ /g" \
+                -e "s/(__force[[:space:]]\{1,\}/ (/g" \
+                -e "s/[[:space:]]__iomem[[:space:]]\{1,\}/ /g" \
+                -e "s/(__iomem[[:space:]]\{1,\}/ (/g" \
+                -e "s/[[:space:]]__attribute_const__[[:space:]]\{1,\}/\ /g" \
                 -e "s/[[:space:]]__attribute_const__$$//" \
                 -e "/^\#include <linux\/compiler.h>/d"