On Thu 2008-02-07 23:28:33, Sam Ravnborg wrote:
> > ===================================================================
> > --- /dev/null
> > +++ linux-2.6/arch/x86/kernel/acpi/realmode/wakeup.ld
> > @@ -0,0 +1,51 @@
> > +/*
> > + * wakeup.ld
> > + *
> > + * Linker script for the real-mode wakeup code
> > + */
> > +OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
> > +OUTPUT_ARCH(i386)
> > +ENTRY(_start)
> > +
> > +SECTIONS
> > +{
> > +   . = 0x3f00;
> > +   .header         : { *(.header) }
> 
> Can we please use C style in this file.
> Like this:

Commiting now :-).
                                                Pavel

diff --git a/arch/x86/kernel/acpi/realmode/wakeup.ld 
b/arch/x86/kernel/acpi/realmode/wakeup.ld
index 5dff2f0..1a1e755 100644
--- a/arch/x86/kernel/acpi/realmode/wakeup.ld
+++ b/arch/x86/kernel/acpi/realmode/wakeup.ld
@@ -10,31 +10,38 @@ ENTRY(_start)
 SECTIONS
 {
        . = 0x3f00;
-       .header         : { *(.header) }
+       .header : {
+                *(.header)
+       }
 
        . = 0;
-       .text           : { *(.text*) }
+       .text : {
+                *(.text*)
+       }
 
        . = ALIGN(16);
-       .rodata         : { *(.rodata*) }
+       .rodata : {
+               *(.rodata*)
+       }
 
-       .videocards     : {
+       .videocards : {
                video_cards = .;
                *(.videocards)
                video_cards_end = .;
        }
 
        . = ALIGN(16);
-       .data           : { *(.data*) }
+       .data : {
+                *(.data*)
+       }
 
-       .signature      : {
+       .signature : {
                end_signature = .;
                LONG(0x65a22c82)
        }
 
        . = ALIGN(16);
-       .bss            :
-       {
+       .bss :  {
                __bss_start = .;
                *(.bss)
                __bss_end = .;
@@ -43,7 +50,9 @@ SECTIONS
        . = ALIGN(16);
        _end = .;
 
-       /DISCARD/ : { *(.note*) }
+       /DISCARD/ : {
+               *(.note*)
+       }
 
        /* Adjust this as appropriate */
        /* This allows 4 pages (16K) */



> 
> {
>       .header : {
>               *(.header)
>       }
> 
> It is not as short as the above but it pays of to keep
> an consistent style in the whole file and across
> different .lds files.
> 
> And for good measure name it wakeup.lds.
> 
> Do we never need data from a .h file?
> If we do name it wakeup.lds.S and kbuild
> will fix it (assuming we have wakeup.lds
> as a prerequisite where it is needed.
> 
> > +
> > +   . = 0;
> > +   .text           : { *(.text*) }
> > +
> > +   . = ALIGN(16);
> Why?
> > +   .rodata         : { *(.rodata*) }
> > +
> > +   .videocards     : {
> > +           video_cards = .;
> > +           *(.videocards)
> > +           video_cards_end = .;
> > +   }
> > +
> > +   . = ALIGN(16);
> Why?
> > +   .data           : { *(.data*) }
> > +
> > +   .signature      : {
> > +           end_signature = .;
> > +           LONG(0x65a22c82)
> > +   }
> > +
> > +   . = ALIGN(16);
> Why?
> > +   .bss            :
> > +   {
> > +           __bss_start = .;
> > +           *(.bss)
> > +           __bss_end = .;
> > +   }
> > +
> > +   . = ALIGN(16);
> Why?
> > +   _end = .;
> > +
> > +   /DISCARD/ : { *(.note*) }
> > +
> > +   /* Adjust this as appropriate */
> > +   /* This allows 4 pages (16K) */
> > +   . = ASSERT(_end <= 0x4000, "Wakeup too big!");
> PAGE_SIZE * 4?
> 
> 
>       Sam

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) 
http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to