44 files changed, 159 insertions, 171 deletions

diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S
index 55c05b511f4..f13249be17c 100644
--- a/arch/alpha/kernel/vmlinux.lds.S
+++ b/arch/alpha/kernel/vmlinux.lds.S
@@ -46,11 +46,11 @@ SECTIONS
         __init_begin = .;
         .init.text : {
                 _sinittext = .;
-                *(.init.text)
+                INIT_TEXT
                 _einittext = .;
         }
         .init.data : {
-                *(.init.data)
+                INIT_DATA
         }
 
         . = ALIGN(16);
@@ -136,8 +136,8 @@ SECTIONS
 
         /* Sections to be discarded */
         /DISCARD/ : {
-                *(.exit.text)
-                *(.exit.data)
+                EXIT_TEXT
+                EXIT_DATA
                 *(.exitcall.exit)
         }
 
diff --git a/arch/alpha/lib/dec_and_lock.c b/arch/alpha/lib/dec_and_lock.c
index 6ae2500a9d9..0f5520d2f45 100644
--- a/arch/alpha/lib/dec_and_lock.c
+++ b/arch/alpha/lib/dec_and_lock.c
@@ -30,8 +30,7 @@ _atomic_dec_and_lock:				\n\
         .previous                               \n\
         .end _atomic_dec_and_lock");
 
-static int __attribute_used__
-atomic_dec_and_lock_1(atomic_t *atomic, spinlock_t *lock)
+static int __used atomic_dec_and_lock_1(atomic_t *atomic, spinlock_t *lock)
 {
         /* Slow path */
         spin_lock(lock);
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index 30f732c7fdb..4898bdcfe7d 100644
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@ -30,7 +30,7 @@ SECTIONS
         }
 
         .init : {                       /* Init code and data           */
-                        *(.init.text)
+                        INIT_TEXT
                 _einittext = .;
                 __proc_info_begin = .;
                         *(.proc.info.init)
@@ -70,15 +70,15 @@ SECTIONS
                 __per_cpu_end = .;
 #ifndef CONFIG_XIP_KERNEL
                 __init_begin = _stext;
-                *(.init.data)
+                INIT_DATA
                 . = ALIGN(4096);
                 __init_end = .;
 #endif
         }
 
         /DISCARD/ : {                   /* Exit code and data           */
-                *(.exit.text)
-                *(.exit.data)
+                EXIT_TEXT
+                EXIT_DATA
                 *(.exitcall.exit)
 #ifndef CONFIG_MMU
                 *(.fixup)
@@ -130,7 +130,7 @@ SECTIONS
 #ifdef CONFIG_XIP_KERNEL
                 . = ALIGN(4096);
                 __init_begin = .;
-                *(.init.data)
+                INIT_DATA
                 . = ALIGN(4096);
                 __init_end = .;
 #endif
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index 02272aa36e9..88d5e61a2e1 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -1,9 +1,6 @@
 #
 # Makefile for the linux kernel.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
 
 # Object file lists.
 
diff --git a/arch/arm/mach-netx/Makefile b/arch/arm/mach-netx/Makefile
index 18785ff3765..7ce4ba9eb24 100644
--- a/arch/arm/mach-netx/Makefile
+++ b/arch/arm/mach-netx/Makefile
@@ -1,9 +1,6 @@
 #
 # Makefile for the linux kernel.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
 
 # Object file lists.
 
diff --git a/arch/avr32/kernel/vmlinux.lds.S b/arch/avr32/kernel/vmlinux.lds.S
index 11f08e35a2e..481cfd40c05 100644
--- a/arch/avr32/kernel/vmlinux.lds.S
+++ b/arch/avr32/kernel/vmlinux.lds.S
@@ -27,19 +27,19 @@ SECTIONS
                 __init_begin = .;
                         _sinittext = .;
                         *(.text.reset)
-                        *(.init.text)
+                        INIT_TEXT
                         /*
                          * .exit.text is discarded at runtime, not
                          * link time, to deal with references from
                          * __bug_table
                          */
-                        *(.exit.text)
+                        EXIT_TEXT
                         _einittext = .;
                 . = ALIGN(4);
                 __tagtable_begin = .;
                         *(.taglist.init)
                 __tagtable_end = .;
-                        *(.init.data)
+                        INIT_DATA
                 . = ALIGN(16);
                 __setup_start = .;
                         *(.init.setup)
@@ -135,7 +135,7 @@ SECTIONS
          * thrown away, as cleanup code is never called unless it's a module.
          */
         /DISCARD/               : {
-                *(.exit.data)
+                EXIT_DATA
                 *(.exitcall.exit)
         }
 
diff --git a/arch/blackfin/kernel/vmlinux.lds.S b/arch/blackfin/kernel/vmlinux.lds.S
index 9b75bc83c71..858722421b4 100644
--- a/arch/blackfin/kernel/vmlinux.lds.S
+++ b/arch/blackfin/kernel/vmlinux.lds.S
@@ -91,13 +91,13 @@ SECTIONS
         {
                 . = ALIGN(PAGE_SIZE);
                 __sinittext = .;
-                *(.init.text)
+                INIT_TEXT
                 __einittext = .;
         }
         .init.data :
         {
                 . = ALIGN(16);
-                *(.init.data)
+                INIT_DATA
         }
         .init.setup :
         {
@@ -198,8 +198,8 @@ SECTIONS
 
         /DISCARD/ :
         {
-                *(.exit.text)
-                *(.exit.data)
+                EXIT_TEXT
+                EXIT_DATA
                 *(.exitcall.exit)
         }
 }
diff --git a/arch/cris/arch-v10/vmlinux.lds.S b/arch/cris/arch-v10/vmlinux.lds.S
index 97a7876ed68..93c9f0ea286 100644
--- a/arch/cris/arch-v10/vmlinux.lds.S
+++ b/arch/cris/arch-v10/vmlinux.lds.S
@@ -57,10 +57,10 @@ SECTIONS
         __init_begin = .;
         .init.text : { 
                    _sinittext = .;
-                   *(.init.text)
+                   INIT_TEXT
                    _einittext = .;
         }
-        .init.data : { *(.init.data) }
+        .init.data : { INIT_DATA }
         . = ALIGN(16);
         __setup_start = .;
         .init.setup : { *(.init.setup) }
@@ -109,8 +109,8 @@ SECTIONS
 
         /* Sections to be discarded */
         /DISCARD/ : {
-                *(.text.exit)
-                *(.data.exit)
+                EXIT_TEXT
+                EXIT_DATA
                 *(.exitcall.exit)
         }
 
diff --git a/arch/cris/arch-v32/boot/compressed/Makefile b/arch/cris/arch-v32/boot/compressed/Makefile
index 9f77eda914b..609692f9d5e 100644
--- a/arch/cris/arch-v32/boot/compressed/Makefile
+++ b/arch/cris/arch-v32/boot/compressed/Makefile
@@ -7,7 +7,7 @@
 target = $(target_compressed_dir)
 src    = $(src_compressed_dir)
 
-CC = gcc-cris -mlinux -march=v32 -I $(TOPDIR)/include
+CC = gcc-cris -mlinux -march=v32 $(LINUXINCLUDE)
 CFLAGS = -O2
 LD = gcc-cris -mlinux -march=v32 -nostdlib
 OBJCOPY = objcopy-cris
diff --git a/arch/cris/arch-v32/vmlinux.lds.S b/arch/cris/arch-v32/vmlinux.lds.S
index b076c134c0b..fead8c59ea6 100644
--- a/arch/cris/arch-v32/vmlinux.lds.S
+++ b/arch/cris/arch-v32/vmlinux.lds.S
@@ -61,10 +61,10 @@ SECTIONS
         __init_begin = .;
         .init.text : {
                    _sinittext = .;
-                   *(.init.text)
+                   INIT_TEXT
                    _einittext = .;
         }
-        .init.data : { *(.init.data) }
+        .init.data : { INIT_DATA }
         . = ALIGN(16);
         __setup_start = .;
         .init.setup : { *(.init.setup) }
@@ -124,8 +124,8 @@ SECTIONS
 
         /* Sections to be discarded */
         /DISCARD/ : {
-                *(.text.exit)
-                *(.data.exit)
+                EXIT_TEXT
+                EXIT_DATA
                 *(.exitcall.exit)
         }
 
diff --git a/arch/frv/boot/Makefile b/arch/frv/boot/Makefile
index dc6f0382442..6ae3254da01 100644
--- a/arch/frv/boot/Makefile
+++ b/arch/frv/boot/Makefile
@@ -10,7 +10,7 @@
 
 targets := Image zImage bootpImage
 
-SYSTEM  =$(TOPDIR)/$(LINUX)
+SYSTEM  =$(LINUX)
 
 ZTEXTADDR        = 0x02080000
 PARAMS_PHYS      = 0x0207c000
@@ -45,7 +45,7 @@ zImage:	$(CONFIGURE) compressed/$(LINUX)
 bootpImage: bootp/bootp
         $(OBJCOPY) -O binary -R .note -R .comment -S bootp/bootp $@
 
-compressed/$(LINUX): $(TOPDIR)/$(LINUX) dep
+compressed/$(LINUX): $(LINUX) dep
         @$(MAKE) -C compressed $(LINUX)
 
 bootp/bootp: zImage initrd
@@ -59,10 +59,10 @@ initrd:
 # installation
 #
 install: $(CONFIGURE) Image
-        sh ./install.sh $(KERNELRELEASE) Image $(TOPDIR)/System.map "$(INSTALL_PATH)"
+        sh ./install.sh $(KERNELRELEASE) Image System.map "$(INSTALL_PATH)"
 
 zinstall: $(CONFIGURE) zImage
-        sh ./install.sh $(KERNELRELEASE) zImage $(TOPDIR)/System.map "$(INSTALL_PATH)"
+        sh ./install.sh $(KERNELRELEASE) zImage System.map "$(INSTALL_PATH)"
 
 #
 # miscellany
diff --git a/arch/frv/kernel/gdb-stub.c b/arch/frv/kernel/gdb-stub.c
index e89cad1192a..48a0393e7ce 100644
--- a/arch/frv/kernel/gdb-stub.c
+++ b/arch/frv/kernel/gdb-stub.c
@@ -87,7 +87,7 @@
  *  Example:
  *    $ cd ~/linux
  *    $ make menuconfig <go to "Kernel Hacking" and turn on remote debugging>
- *    $ make dep; make vmlinux
+ *    $ make vmlinux
  *
  *  Step 3:
  *  Download the kernel to the remote target and start
diff --git a/arch/frv/kernel/vmlinux.lds.S b/arch/frv/kernel/vmlinux.lds.S
index a17a81d58bf..f42b328b1dd 100644
--- a/arch/frv/kernel/vmlinux.lds.S
+++ b/arch/frv/kernel/vmlinux.lds.S
@@ -28,14 +28,14 @@ SECTIONS
   .init.text : {
         *(.text.head)
 #ifndef CONFIG_DEBUG_INFO
-        *(.init.text)
-        *(.exit.text)
-        *(.exit.data)
+        INIT_TEXT
+        EXIT_TEXT
+        EXIT_DATA
         *(.exitcall.exit)
 #endif
   }
   _einittext = .;
-  .init.data : { *(.init.data) }
+  .init.data : { INIT_DATA }
 
   . = ALIGN(8);
   __setup_start = .;
@@ -106,8 +106,8 @@ SECTIONS
         LOCK_TEXT
 #ifdef CONFIG_DEBUG_INFO
         *(
-        .init.text
-        .exit.text
+        INIT_TEXT
+        EXIT_TEXT
         .exitcall.exit
         )
 #endif
@@ -138,7 +138,7 @@ SECTIONS
   .data : {                     /* Data */
         DATA_DATA
         *(.data.*)
-        *(.exit.data)
+        EXIT_DATA
         CONSTRUCTORS
         }
 
diff --git a/arch/h8300/kernel/vmlinux.lds.S b/arch/h8300/kernel/vmlinux.lds.S
index a2e72d49555..43a87b9085b 100644
--- a/arch/h8300/kernel/vmlinux.lds.S
+++ b/arch/h8300/kernel/vmlinux.lds.S
@@ -110,9 +110,9 @@ SECTIONS
         . = ALIGN(0x4) ;
         ___init_begin = .;
         __sinittext = .; 
-                *(.init.text)
+                INIT_TEXT
         __einittext = .; 
-                *(.init.data)
+                INIT_DATA
         . = ALIGN(0x4) ;
         ___setup_start = .;
                 *(.init.setup)
@@ -124,8 +124,8 @@ SECTIONS
         ___con_initcall_start = .;
                 *(.con_initcall.init)
         ___con_initcall_end = .;
-                *(.exit.text)
-                *(.exit.data)
+                EXIT_TEXT
+                EXIT_DATA
 #if defined(CONFIG_BLK_DEV_INITRD)
                 . = ALIGN(4);
         ___initramfs_start = .;
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
index 757e419ebcf..80622acc95d 100644
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
@@ -27,8 +27,8 @@ SECTIONS
 {
   /* Sections to be discarded */
   /DISCARD/ : {
-        *(.exit.text)
-        *(.exit.data)
+        EXIT_TEXT
+        EXIT_DATA
         *(.exitcall.exit)
         *(.IA_64.unwind.exit.text)
         *(.IA_64.unwind_info.exit.text)
@@ -119,12 +119,12 @@ SECTIONS
   .init.text : AT(ADDR(.init.text) - LOAD_OFFSET)
         {
           _sinittext = .;
-          *(.init.text)
+          INIT_TEXT
           _einittext = .;
         }
 
   .init.data : AT(ADDR(.init.data) - LOAD_OFFSET)
-        { *(.init.data) }
+        { INIT_DATA }
 
 #ifdef CONFIG_BLK_DEV_INITRD
   .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET)
diff --git a/arch/m32r/kernel/vmlinux.lds.S b/arch/m32r/kernel/vmlinux.lds.S
index 942a8c7a441..41b07854fcc 100644
--- a/arch/m32r/kernel/vmlinux.lds.S
+++ b/arch/m32r/kernel/vmlinux.lds.S
@@ -76,10 +76,10 @@ SECTIONS
   __init_begin = .;
   .init.text : {
         _sinittext = .;
-        *(.init.text)
+        INIT_TEXT
         _einittext = .;
   }
-  .init.data : { *(.init.data) }
+  .init.data : { INIT_DATA }
   . = ALIGN(16);
   __setup_start = .;
   .init.setup : { *(.init.setup) }
@@ -100,8 +100,8 @@ SECTIONS
   .altinstr_replacement : { *(.altinstr_replacement) }
   /* .exit.text is discard at runtime, not link time, to deal with references
      from .altinstructions and .eh_frame */
-  .exit.text : { *(.exit.text) }
-  .exit.data : { *(.exit.data) }
+  .exit.text : { EXIT_TEXT }
+  .exit.data : { EXIT_DATA }
 
 #ifdef CONFIG_BLK_DEV_INITRD
   . = ALIGN(4096);
@@ -124,8 +124,8 @@ SECTIONS
 
   /* Sections to be discarded */
   /DISCARD/ : {
-        *(.exit.text)
-        *(.exit.data)
+        EXIT_TEXT
+        EXIT_DATA
         *(.exitcall.exit)
         }
 
diff --git a/arch/m68k/kernel/vmlinux-std.lds b/arch/m68k/kernel/vmlinux-std.lds
index 59fe285865e..7537cc5e615 100644
--- a/arch/m68k/kernel/vmlinux-std.lds
+++ b/arch/m68k/kernel/vmlinux-std.lds
@@ -45,10 +45,10 @@ SECTIONS
   __init_begin = .;
   .init.text : {
         _sinittext = .;
-        *(.init.text)
+        INIT_TEXT
         _einittext = .;
   }
-  .init.data : { *(.init.data) }
+  .init.data : { INIT_DATA }
   . = ALIGN(16);
   __setup_start = .;
   .init.setup : { *(.init.setup) }
@@ -82,8 +82,8 @@ SECTIONS
 
   /* Sections to be discarded */
   /DISCARD/ : {
-        *(.exit.text)
-        *(.exit.data)
+        EXIT_TEXT
+        EXIT_DATA
         *(.exitcall.exit)
         }
 
diff --git a/arch/m68k/kernel/vmlinux-sun3.lds b/arch/m68k/kernel/vmlinux-sun3.lds
index 4adffefb5c4..cdc313e7c29 100644
--- a/arch/m68k/kernel/vmlinux-sun3.lds
+++ b/arch/m68k/kernel/vmlinux-sun3.lds
@@ -38,10 +38,10 @@ SECTIONS
 __init_begin = .;
         .init.text : {
                 _sinittext = .;
-                *(.init.text)
+                INIT_TEXT
                 _einittext = .;
         }
-        .init.data : { *(.init.data) }
+        .init.data : { INIT_DATA }
         . = ALIGN(16);
         __setup_start = .;
         .init.setup : { *(.init.setup) }
@@ -77,8 +77,8 @@ __init_begin = .;
 
   /* Sections to be discarded */
   /DISCARD/ : {
-        *(.exit.text)
-        *(.exit.data)
+        EXIT_TEXT
+        EXIT_DATA
         *(.exitcall.exit)
         }
 
diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S
index 07a0055602f..b44edb08e21 100644
--- a/arch/m68knommu/kernel/vmlinux.lds.S
+++ b/arch/m68knommu/kernel/vmlinux.lds.S
@@ -143,9 +143,9 @@ SECTIONS {
                 . = ALIGN(4096);
                 __init_begin = .;
                 _sinittext = .;
-                *(.init.text)
+                INIT_TEXT
                 _einittext = .;
-                *(.init.data)
+                INIT_DATA
                 . = ALIGN(16);
                 __setup_start = .;
                 *(.init.setup)
@@ -170,8 +170,8 @@ SECTIONS {
         } > INIT
 
         /DISCARD/ : {
-                *(.exit.text)
-                *(.exit.data)
+                EXIT_TEXT
+                EXIT_DATA
                 *(.exitcall.exit)
         }
 
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index 5fc2398bdb7..b5470ceb418 100644
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -114,11 +114,11 @@ SECTIONS
         __init_begin = .;
         .init.text : {
                 _sinittext = .;
-                *(.init.text)
+                INIT_TEXT
                 _einittext = .;
         }
         .init.data : {
-                *(.init.data)
+                INIT_DATA
         }
         . = ALIGN(16);
         .init.setup : {
@@ -144,10 +144,10 @@ SECTIONS
          * references from .rodata
          */
         .exit.text : {
-                *(.exit.text)
+                EXIT_TEXT
         }
         .exit.data : {
-                *(.exit.data)
+                EXIT_DATA
         }
 #if defined(CONFIG_BLK_DEV_INITRD)
         . = ALIGN(_PAGE_SIZE);
diff --git a/arch/mips/tx4927/common/Makefile b/arch/mips/tx4927/common/Makefile
index 18375787e09..e8629617f25 100644
--- a/arch/mips/tx4927/common/Makefile
+++ b/arch/mips/tx4927/common/Makefile
@@ -1,10 +1,6 @@
 #
 # Makefile for common code for Toshiba TX4927 based systems
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
 
 obj-y   += tx4927_prom.o tx4927_setup.o tx4927_irq.o
 
diff --git a/arch/mips/tx4938/common/Makefile b/arch/mips/tx4938/common/Makefile
index 8352eca6790..eff3d1d47f8 100644
--- a/arch/mips/tx4938/common/Makefile
+++ b/arch/mips/tx4938/common/Makefile
@@ -1,10 +1,6 @@
 #
 # Makefile for common code for Toshiba TX4927 based systems
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
 
 obj-y   += prom.o setup.o irq.o
 obj-$(CONFIG_KGDB) += dbgio.o
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/Makefile b/arch/mips/tx4938/toshiba_rbtx4938/Makefile
index 675bb1c3e40..2316dd7dd1b 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/Makefile
+++ b/arch/mips/tx4938/toshiba_rbtx4938/Makefile
@@ -1,10 +1,6 @@
 #
 # Makefile for common code for Toshiba TX4927 based systems
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
 
 obj-y   += prom.o setup.o irq.o spi_eeprom.o
 
diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S
index 40d0ff9b81a..50b4a3a25d0 100644
--- a/arch/parisc/kernel/vmlinux.lds.S
+++ b/arch/parisc/kernel/vmlinux.lds.S
@@ -172,11 +172,11 @@ SECTIONS
         __init_begin = .;
         .init.text : { 
                 _sinittext = .;
-                *(.init.text)
+                INIT_TEXT
                 _einittext = .;
         }
         .init.data : {
-                *(.init.data)
+                INIT_DATA
         }
         . = ALIGN(16);
         .init.setup : {
@@ -215,10 +215,10 @@ SECTIONS
          *  from .altinstructions and .eh_frame
          */
         .exit.text : {
-                *(.exit.text)
+                EXIT_TEXT
         }
         .exit.data : {
-                *(.exit.data)
+                EXIT_DATA
         }
 #ifdef CONFIG_BLK_DEV_INITRD
         . = ALIGN(PAGE_SIZE);
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 18e32719d0e..4b1d98b8135 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -65,7 +65,7 @@ obj-wlib := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-wlib))))
 obj-plat := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-plat))))
 
 quiet_cmd_copy_zlib = COPY    $@
-      cmd_copy_zlib = sed "s@__attribute_used__@@;s@<linux/\([^>]*\).*@\"\1\"@" $< > $@
+      cmd_copy_zlib = sed "s@__used@@;s@<linux/\([^>]*\).*@\"\1\"@" $< > $@
 
 quiet_cmd_copy_zlibheader = COPY    $@
       cmd_copy_zlibheader = sed "s@<linux/\([^>]*\).*@\"\1\"@" $< > $@
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
index 25d9a96484d..c8127f832df 100644
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@ -158,7 +158,7 @@ static ssize_t show_##NAME(struct sys_device *dev, char *buf) \
         unsigned long val = run_on_cpu(cpu->sysdev.id, read_##NAME, 0); \
         return sprintf(buf, "%lx\n", val); \
 } \
-static ssize_t __attribute_used__ \
+static ssize_t __used \
         store_##NAME(struct sys_device *dev, const char *buf, size_t count) \
 { \
         struct cpu *cpu = container_of(dev, struct cpu, sysdev); \
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index f66fa5d966b..0afb9e31d2a 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -23,7 +23,7 @@ SECTIONS
         /* Sections to be discarded. */
         /DISCARD/ : {
         *(.exitcall.exit)
-        *(.exit.data)
+        EXIT_DATA
         }
 
         . = KERNELBASE;
@@ -76,17 +76,19 @@ SECTIONS
 
         .init.text : {
                 _sinittext = .;
-                *(.init.text)
+                INIT_TEXT
                 _einittext = .;
         }
 
         /* .exit.text is discarded at runtime, not link time,
          * to deal with references from __bug_table
          */
-        .exit.text : { *(.exit.text) }
+        .exit.text : {
+                EXIT_TEXT
+        }
 
         .init.data : {
-                *(.init.data);
+                INIT_DATA
                 __vtop_table_begin = .;
                 *(.vtop_fixup);
                 __vtop_table_end = .;
diff --git a/arch/powerpc/oprofile/op_model_power4.c b/arch/powerpc/oprofile/op_model_power4.c
index cddc250a6a5..446a8bbb847 100644
--- a/arch/powerpc/oprofile/op_model_power4.c
+++ b/arch/powerpc/oprofile/op_model_power4.c
@@ -172,15 +172,15 @@ static void power4_stop(void)
 }
 
 /* Fake functions used by canonicalize_pc */
-static void __attribute_used__ hypervisor_bucket(void)
+static void __used hypervisor_bucket(void)
 {
 }
 
-static void __attribute_used__ rtas_bucket(void)
+static void __used rtas_bucket(void)
 {
 }
 
-static void __attribute_used__ kernel_unknown_bucket(void)
+static void __used kernel_unknown_bucket(void)
 {
 }
 
diff --git a/arch/ppc/kernel/vmlinux.lds.S b/arch/ppc/kernel/vmlinux.lds.S
index 98c1212674f..52b64fcbdfc 100644
--- a/arch/ppc/kernel/vmlinux.lds.S
+++ b/arch/ppc/kernel/vmlinux.lds.S
@@ -97,14 +97,14 @@ SECTIONS
   __init_begin = .;
   .init.text : {
         _sinittext = .;
-        *(.init.text)
+        INIT_TEXT
         _einittext = .;
   }
   /* .exit.text is discarded at runtime, not link time,
      to deal with references from __bug_table */
-  .exit.text : { *(.exit.text) }
+  .exit.text : { EXIT_TEXT }
   .init.data : {
-    *(.init.data);
+    INIT_DATA
     __vtop_table_begin = .;
     *(.vtop_fixup);
     __vtop_table_end = .;
@@ -164,6 +164,6 @@ SECTIONS
   /* Sections to be discarded. */
   /DISCARD/ : {
     *(.exitcall.exit)
-    *(.exit.data)
+    EXIT_DATA
   }
 }
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index 93615919934..7d43c3cd3ef 100644
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -97,7 +97,7 @@ SECTIONS
         __init_begin = .;
         .init.text : {
                 _sinittext = .;
-                *(.init.text)
+                INIT_TEXT
                 _einittext = .;
         }
         /*
@@ -105,11 +105,11 @@ SECTIONS
          * to deal with references from __bug_table
         */
         .exit.text : {
-                *(.exit.text)
+                EXIT_TEXT
         }
 
         .init.data : {
-                *(.init.data)
+                INIT_DATA
         }
         . = ALIGN(0x100);
         .init.setup : {
@@ -156,7 +156,7 @@ SECTIONS
 
         /* Sections to be discarded */
         /DISCARD/ : {
-                *(.exit.data)
+                EXIT_DATA
                 *(.exitcall.exit)
         }
 
diff --git a/arch/sh/kernel/vmlinux_32.lds.S b/arch/sh/kernel/vmlinux_32.lds.S
index d549fac6d3e..c7113786ecd 100644
--- a/arch/sh/kernel/vmlinux_32.lds.S
+++ b/arch/sh/kernel/vmlinux_32.lds.S
@@ -84,9 +84,9 @@ SECTIONS
         . = ALIGN(PAGE_SIZE);           /* Init code and data */
         __init_begin = .;
         _sinittext = .;
-        .init.text : { *(.init.text) }
+        .init.text : { INIT_TEXT }
         _einittext = .;
-        .init.data : { *(.init.data) }
+        .init.data : { INIT_DATA }
 
         . = ALIGN(16);
         __setup_start = .;
@@ -122,8 +122,8 @@ SECTIONS
          * .exit.text is discarded at runtime, not link time, to deal with
          * references from __bug_table
          */
-        .exit.text : { *(.exit.text) }
-        .exit.data : { *(.exit.data) }
+        .exit.text : { EXIT_TEXT }
+        .exit.data : { EXIT_DATA }
 
         . = ALIGN(PAGE_SIZE);
         .bss : {
diff --git a/arch/sh/kernel/vmlinux_64.lds.S b/arch/sh/kernel/vmlinux_64.lds.S
index 2fd0f740148..3f1bd6392bb 100644
--- a/arch/sh/kernel/vmlinux_64.lds.S
+++ b/arch/sh/kernel/vmlinux_64.lds.S
@@ -96,9 +96,9 @@ SECTIONS
         . = ALIGN(PAGE_SIZE);           /* Init code and data */
         __init_begin = .;
         _sinittext = .;
-        .init.text : C_PHYS(.init.text) { *(.init.text) }
+        .init.text : C_PHYS(.init.text) { INIT_TEXT }
         _einittext = .;
-        .init.data : C_PHYS(.init.data) { *(.init.data) }
+        .init.data : C_PHYS(.init.data) { INIT_DATA }
         . = ALIGN(L1_CACHE_BYTES);      /* Better if Cache Line aligned */
         __setup_start = .;
         .init.setup : C_PHYS(.init.setup) { *(.init.setup) }
@@ -134,8 +134,8 @@ SECTIONS
          * .exit.text is discarded at runtime, not link time, to deal with
          * references from __bug_table
          */
-        .exit.text : C_PHYS(.exit.text) { *(.exit.text) }
-        .exit.data : C_PHYS(.exit.data) { *(.exit.data) }
+        .exit.text : C_PHYS(.exit.text) { EXIT_TEXT }
+        .exit.data : C_PHYS(.exit.data) { EXIT_DATA }
 
         . = ALIGN(PAGE_SIZE);
         .bss : C_PHYS(.bss) {
diff --git a/arch/sparc/kernel/vmlinux.lds.S b/arch/sparc/kernel/vmlinux.lds.S
index a8b4200f9cc..216147d6e61 100644
--- a/arch/sparc/kernel/vmlinux.lds.S
+++ b/arch/sparc/kernel/vmlinux.lds.S
@@ -48,12 +48,12 @@ SECTIONS
         __init_begin = .;
         .init.text : {
                 _sinittext = .;
-                *(.init.text)
+                INIT_TEXT
                 _einittext = .;
         }
         __init_text_end = .;
         .init.data : {
-                *(.init.data)
+                INIT_DATA
         }
         . = ALIGN(16);
         .init.setup : {
@@ -102,8 +102,8 @@ SECTIONS
         _end = . ;
         PROVIDE (end = .);
         /DISCARD/ : {
-                *(.exit.text)
-                *(.exit.data)
+                EXIT_TEXT
+                EXIT_DATA
                 *(.exitcall.exit)
         }
 
diff --git a/arch/sparc64/kernel/unaligned.c b/arch/sparc64/kernel/unaligned.c
index 953be816fa2..dc7bf1b6321 100644
--- a/arch/sparc64/kernel/unaligned.c
+++ b/arch/sparc64/kernel/unaligned.c
@@ -175,7 +175,7 @@ unsigned long compute_effective_address(struct pt_regs *regs,
 }
 
 /* This is just to make gcc think die_if_kernel does return... */
-static void __attribute_used__ unaligned_panic(char *str, struct pt_regs *regs)
+static void __used unaligned_panic(char *str, struct pt_regs *regs)
 {
         die_if_kernel(str, regs);
 }
diff --git a/arch/sparc64/kernel/vmlinux.lds.S b/arch/sparc64/kernel/vmlinux.lds.S
index 9fcd503bc04..01f809617e5 100644
--- a/arch/sparc64/kernel/vmlinux.lds.S
+++ b/arch/sparc64/kernel/vmlinux.lds.S
@@ -56,11 +56,11 @@ SECTIONS
         .init.text : {
                 __init_begin = .;
                 _sinittext = .;
-                *(.init.text)
+                INIT_TEXT
                 _einittext = .;
         }
         .init.data : {
-                *(.init.data)
+                INIT_DATA
         }
         . = ALIGN(16);
         .init.setup : {
@@ -137,8 +137,8 @@ SECTIONS
         PROVIDE (end = .);
 
         /DISCARD/ : {
-                *(.exit.text)
-                *(.exit.data)
+                EXIT_TEXT
+                EXIT_DATA
                 *(.exitcall.exit)
         }
 
diff --git a/arch/um/include/init.h b/arch/um/include/init.h
index d4de7c0120c..cebc6cae919 100644
--- a/arch/um/include/init.h
+++ b/arch/um/include/init.h
@@ -42,15 +42,15 @@ typedef void (*exitcall_t)(void);
 
 /* These are for everybody (although not all archs will actually
    discard it in modules) */
-#define __init          __attribute__ ((__section__ (".init.text")))
-#define __initdata      __attribute__ ((__section__ (".init.data")))
-#define __exitdata      __attribute__ ((__section__(".exit.data")))
-#define __exit_call     __attribute_used__ __attribute__ ((__section__ (".exitcall.exit")))
+#define __init          __section(.init.text)
+#define __initdata      __section(.init.data)
+#define __exitdata      __section(.exit.data)
+#define __exit_call     __used __section(.exitcall.exit)
 
 #ifdef MODULE
-#define __exit          __attribute__ ((__section__(".exit.text")))
+#define __exit          __section(.exit.text)
 #else
-#define __exit          __attribute_used__ __attribute__ ((__section__(".exit.text")))
+#define __exit          __used __section(.exit.text)
 #endif
 
 #endif
@@ -103,16 +103,16 @@ extern struct uml_param __uml_setup_start, __uml_setup_end;
  * Mark functions and data as being only used at initialization
  * or exit time.
  */
-#define __uml_init_setup        __attribute_used__ __attribute__ ((__section__ (".uml.setup.init")))
-#define __uml_setup_help        __attribute_used__ __attribute__ ((__section__ (".uml.help.init")))
-#define __uml_init_call         __attribute_used__ __attribute__ ((__section__ (".uml.initcall.init")))
-#define __uml_postsetup_call    __attribute_used__ __attribute__ ((__section__ (".uml.postsetup.init")))
-#define __uml_exit_call         __attribute_used__ __attribute__ ((__section__ (".uml.exitcall.exit")))
+#define __uml_init_setup        __used __section(.uml.setup.init)
+#define __uml_setup_help        __used __section(.uml.help.init)
+#define __uml_init_call         __used __section(.uml.initcall.init)
+#define __uml_postsetup_call    __used __section(.uml.postsetup.init)
+#define __uml_exit_call         __used __section(.uml.exitcall.exit)
 
 #ifndef __KERNEL__
 
 #define __define_initcall(level,fn) \
-        static initcall_t __initcall_##fn __attribute_used__ \
+        static initcall_t __initcall_##fn __used \
         __attribute__((__section__(".initcall" level ".init"))) = fn
 
 /* Userspace initcalls shouldn't depend on anything in the kernel, so we'll
@@ -122,7 +122,7 @@ extern struct uml_param __uml_setup_start, __uml_setup_end;
 
 #define __exitcall(fn) static exitcall_t __exitcall_##fn __exit_call = fn
 
-#define __init_call     __attribute_used__ __attribute__ ((__section__ (".initcall.init")))
+#define __init_call     __used __section(.initcall.init)
 
 #endif
 
diff --git a/arch/um/kernel/dyn.lds.S b/arch/um/kernel/dyn.lds.S
index 3866f4960f0..26090b7f323 100644
--- a/arch/um/kernel/dyn.lds.S
+++ b/arch/um/kernel/dyn.lds.S
@@ -17,7 +17,7 @@ SECTIONS
   __init_begin = .;
   .init.text : {
         _sinittext = .;
-        *(.init.text)
+        INIT_TEXT
         _einittext = .;
   }
 
@@ -84,7 +84,7 @@ SECTIONS
 
   #include "asm/common.lds.S"
 
-  init.data : { *(.init.data) }
+  init.data : { INIT_DATA }
 
   /* Ensure the __preinit_array_start label is properly aligned.  We
      could instead move the label definition inside the section, but
diff --git a/arch/um/kernel/uml.lds.S b/arch/um/kernel/uml.lds.S
index 13df191e2b4..5828c1d5450 100644
--- a/arch/um/kernel/uml.lds.S
+++ b/arch/um/kernel/uml.lds.S
@@ -23,7 +23,7 @@ SECTIONS
   __init_begin = .;
   .init.text : {
         _sinittext = .;
-        *(.init.text)
+        INIT_TEXT
         _einittext = .;
   }
   . = ALIGN(4096);
@@ -48,7 +48,7 @@ SECTIONS
 
   #include "asm/common.lds.S"
 
-  init.data : { *(init.data) }
+  init.data : { INIT_DATA }
   .data    :
   {
     . = ALIGN(KERNEL_STACK_SIZE);               /* init_task */
diff --git a/arch/v850/kernel/vmlinux.lds.S b/arch/v850/kernel/vmlinux.lds.S
index 6172599b4ce..d08cd1d27f2 100644
--- a/arch/v850/kernel/vmlinux.lds.S
+++ b/arch/v850/kernel/vmlinux.lds.S
@@ -114,7 +114,7 @@
 #define DATA_CONTENTS                                                         \
                 __sdata = . ;                                                 \
                 DATA_DATA                                                     \
-                        *(.exit.data)   /* 2.5 convention */                  \
+                        EXIT_DATA       /* 2.5 convention */                  \
                         *(.data.exit)   /* 2.4 convention */                  \
                 . = ALIGN (16) ;                                              \
                 *(.data.cacheline_aligned)                                    \
@@ -157,9 +157,9 @@
                 . = ALIGN (4096) ;                                            \
                 __init_start = . ;                                            \
                         __sinittext = .;                                      \
-                        *(.init.text)   /* 2.5 convention */                  \
+                        INIT_TEXT       /* 2.5 convention */                  \
                         __einittext = .;                                      \
-                        *(.init.data)                                         \
+                        INIT_DATA                                             \
                         *(.text.init)   /* 2.4 convention */                  \
                         *(.data.init)                                         \
                 INITCALL_CONTENTS                                             \
@@ -170,7 +170,7 @@
 #define ROMK_INIT_RAM_CONTENTS                                                \
                 . = ALIGN (4096) ;                                            \
                 __init_start = . ;                                            \
-                        *(.init.data)   /* 2.5 convention */                  \
+                        INIT_DATA       /* 2.5 convention */                  \
                         *(.data.init)   /* 2.4 convention */                  \
                 __init_end = . ;                                              \
                 . = ALIGN (4096) ;
@@ -179,7 +179,7 @@
    should go into ROM.  */      
 #define ROMK_INIT_ROM_CONTENTS                                                \
                         _sinittext = .;                                       \
-                        *(.init.text)   /* 2.5 convention */                  \
+                        INIT_TEXT       /* 2.5 convention */                  \
                         _einittext = .;                                       \
                         *(.text.init)   /* 2.4 convention */                  \
                 INITCALL_CONTENTS                                             \
diff --git a/arch/x86/kernel/vmlinux_32.lds.S b/arch/x86/kernel/vmlinux_32.lds.S
index 7d72cce0052..84c913f38f9 100644
--- a/arch/x86/kernel/vmlinux_32.lds.S
+++ b/arch/x86/kernel/vmlinux_32.lds.S
@@ -131,10 +131,12 @@ SECTIONS
   .init.text : AT(ADDR(.init.text) - LOAD_OFFSET) {
         __init_begin = .;
         _sinittext = .;
-        *(.init.text)
+        INIT_TEXT
         _einittext = .;
   }
-  .init.data : AT(ADDR(.init.data) - LOAD_OFFSET) { *(.init.data) }
+  .init.data : AT(ADDR(.init.data) - LOAD_OFFSET) {
+        INIT_DATA
+  }
   . = ALIGN(16);
   .init.setup : AT(ADDR(.init.setup) - LOAD_OFFSET) {
         __setup_start = .;
@@ -169,8 +171,12 @@ SECTIONS
   }
   /* .exit.text is discard at runtime, not link time, to deal with references
      from .altinstructions and .eh_frame */
-  .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) { *(.exit.text) }
-  .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) { *(.exit.data) }
+  .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
+        EXIT_TEXT
+  }
+  .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
+        EXIT_DATA
+  }
 #if defined(CONFIG_BLK_DEV_INITRD)
   . = ALIGN(4096);
   .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) {
diff --git a/arch/x86/kernel/vmlinux_64.lds.S b/arch/x86/kernel/vmlinux_64.lds.S
index ba8ea97abd2..ea5386944e6 100644
--- a/arch/x86/kernel/vmlinux_64.lds.S
+++ b/arch/x86/kernel/vmlinux_64.lds.S
@@ -155,12 +155,15 @@ SECTIONS
   __init_begin = .;
   .init.text : AT(ADDR(.init.text) - LOAD_OFFSET) {
         _sinittext = .;
-        *(.init.text)
+        INIT_TEXT
         _einittext = .;
   }
-  __initdata_begin = .;
-  .init.data : AT(ADDR(.init.data) - LOAD_OFFSET) { *(.init.data) }
-  __initdata_end = .;
+  .init.data : AT(ADDR(.init.data) - LOAD_OFFSET) {
+        __initdata_begin = .;
+        INIT_DATA
+        __initdata_end = .;
+   }
+
   . = ALIGN(16);
   __setup_start = .;
   .init.setup : AT(ADDR(.init.setup) - LOAD_OFFSET) { *(.init.setup) }
@@ -187,8 +190,12 @@ SECTIONS
   }
   /* .exit.text is discard at runtime, not link time, to deal with references
      from .altinstructions and .eh_frame */
-  .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) { *(.exit.text) }
-  .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) { *(.exit.data) }
+  .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
+        EXIT_TEXT
+  }
+  .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
+        EXIT_DATA
+  }
 
 /* vdso blob that is mapped into user space */
   vdso_start = . ;
diff --git a/arch/xtensa/kernel/vmlinux.lds.S b/arch/xtensa/kernel/vmlinux.lds.S
index ac4ed52034d..7d0f55a4982 100644
--- a/arch/xtensa/kernel/vmlinux.lds.S
+++ b/arch/xtensa/kernel/vmlinux.lds.S
@@ -136,13 +136,13 @@ SECTIONS
   __init_begin = .;
   .init.text : {
         _sinittext = .;
-        *(.init.literal) *(.init.text)
+        *(.init.literal) INIT_TEXT
         _einittext = .;
   }
 
   .init.data :
   {
-    *(.init.data)
+    INIT_DATA
     . = ALIGN(0x4);
     __tagtable_begin = .;
     *(.taglist)
@@ -278,8 +278,9 @@ SECTIONS
   /* Sections to be discarded */
   /DISCARD/ :
   {
-        *(.exit.literal .exit.text)
-        *(.exit.data)
+        *(.exit.literal)
+        EXIT_TEXT
+        EXIT_DATA
         *(.exitcall.exit)
   }
 
diff --git a/arch/xtensa/mm/Makefile b/arch/xtensa/mm/Makefile
index 10aec22a8f9..64e304a2f88 100644
--- a/arch/xtensa/mm/Makefile
+++ b/arch/xtensa/mm/Makefile
@@ -1,9 +1,5 @@
 #
 # Makefile for the Linux/Xtensa-specific parts of the memory manager.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
 
 obj-y    := init.o fault.o tlb.o misc.o cache.o
diff --git a/arch/xtensa/platform-iss/Makefile b/arch/xtensa/platform-iss/Makefile
index 5b394e9620e..af96e314d71 100644
--- a/arch/xtensa/platform-iss/Makefile
+++ b/arch/xtensa/platform-iss/Makefile
@@ -3,11 +3,6 @@
 # Makefile for the Xtensa Instruction Set Simulator (ISS)
 # "prom monitor" library routines under Linux.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definitions are in the main makefile...
 
 obj-y                   = io.o console.o setup.o network.o