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

* master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild: (46 commits)
  kbuild: remove obsoleted scripts/reference_* files
  kbuild: fix make help & make *pkg
  kconfig: fix time ordering of writes to .kconfig.d and include/linux/autoconf.h
  Kconfig: remove the CONFIG_CC_ALIGN_* options
  kbuild: add -fverbose-asm to i386 Makefile
  kbuild: clean-up genksyms
  kbuild: Lindent genksyms.c
  kbuild: fix genksyms build error
  kbuild: in makefile.txt note that Makefile is preferred name for kbuild files
  kbuild: replace PHONY with FORCE
  kbuild: Fix bug in crc symbol generating of kernel and modules
  kbuild: change kbuild to not rely on incorrect GNU make behavior
  kbuild: when warning symbols exported twice now tell user this is the problem
  kbuild: fix make dir/file.xx when asm symlink is missing
  kbuild: in the section mismatch check try harder to find symbols
  kbuild: fix section mismatch check for unwind on IA64
  kbuild: kill false positives from section mismatch warnings for powerpc
  kbuild: kill trailing whitespace in modpost & friends
  kbuild: small update of allnoconfig description
  kbuild: make namespace.pl CROSS_COMPILE happy
  ...

Trivial conflict in arch/ppc/boot/Makefile manually fixed up

1 files changed, 0 insertions, 37 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 05951c1d654e..3b36a1d53656 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -365,43 +365,6 @@ config SHMEM
           option replaces shmem and tmpfs with the much simpler ramfs code,
           which may be appropriate on small systems without swap.
 
-config CC_ALIGN_FUNCTIONS
-        int "Function alignment" if EMBEDDED
-        default 0
-        help
-          Align the start of functions to the next power-of-two greater than n,
-          skipping up to n bytes.  For instance, 32 aligns functions
-          to the next 32-byte boundary, but 24 would align to the next
-          32-byte boundary only if this can be done by skipping 23 bytes or less.
-          Zero means use compiler's default.
-
-config CC_ALIGN_LABELS
-        int "Label alignment" if EMBEDDED
-        default 0
-        help
-          Align all branch targets to a power-of-two boundary, skipping
-          up to n bytes like ALIGN_FUNCTIONS.  This option can easily
-          make code slower, because it must insert dummy operations for
-          when the branch target is reached in the usual flow of the code.
-          Zero means use compiler's default.
-
-config CC_ALIGN_LOOPS
-        int "Loop alignment" if EMBEDDED
-        default 0
-        help
-          Align loops to a power-of-two boundary, skipping up to n bytes.
-          Zero means use compiler's default.
-
-config CC_ALIGN_JUMPS
-        int "Jump alignment" if EMBEDDED
-        default 0
-        help
-          Align branch targets to a power-of-two boundary, for branch
-          targets where the targets can only be reached by jumping,
-          skipping up to n bytes like ALIGN_FUNCTIONS.  In this case,
-          no dummy operations need be executed.
-          Zero means use compiler's default.
-
 config SLAB
         default y
         bool "Use full SLAB allocator" if EMBEDDED