Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile

[linux-2.6-omap-h63xx.git] / arch / frv / kernel / vmlinux.lds.S

diff --git a/arch/frv/kernel/vmlinux.lds.S b/arch/frv/kernel/vmlinux.lds.S
index f42b328b1dd0475e1af868308cdc000c89d40942..b95c4eace62fe318c7db0bdbcc46b9968360d5c2 100644 (file)
--- a/arch/frv/kernel/vmlinux.lds.S
+++ b/arch/frv/kernel/vmlinux.lds.S
@@ -13,7 +13,7 @@ ENTRY(_start)
 
 jiffies = jiffies_64 + 4;
 
-__page_offset = 0xc0000000;            /* start of area covered by struct pages */
+__page_offset = CONFIG_PAGE_OFFSET;    /* start of area covered by struct pages */
 __kernel_image_start = __page_offset;  /* address at which kernel image resides */
 
 SECTIONS
@@ -76,9 +76,6 @@ SECTIONS
          *(.data.init_task)
   }
 
-  . = ALIGN(4096);
-  .data.page_aligned : { *(.data.idt) }
-
   . = ALIGN(L1_CACHE_BYTES);
   .data.cacheline_aligned : { *(.data.cacheline_aligned) }
 
@@ -105,11 +102,9 @@ SECTIONS
        SCHED_TEXT
        LOCK_TEXT
 #ifdef CONFIG_DEBUG_INFO
-       *(
        INIT_TEXT
        EXIT_TEXT
-       .exitcall.exit
-       )
+       *(.exitcall.exit)
 #endif
        *(.fixup)
        *(.gnu.warning)