lkml.org 
[lkml]   [2007]   [Mar]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH take3 01/20] early_printk.c switch
    Move the early_printk.c to the common area.

    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

    diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
    index 4ae3dcf..a57040d 100644
    --- a/arch/i386/kernel/Makefile
    +++ b/arch/i386/kernel/Makefile
    @@ -35,7 +35,6 @@ obj-$(CONFIG_ACPI_SRAT) += srat.o
    obj-$(CONFIG_EFI) += efi.o efi_stub.o
    obj-$(CONFIG_DOUBLEFAULT) += doublefault.o
    obj-$(CONFIG_VM86) += vm86.o
    -obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
    obj-$(CONFIG_HPET_TIMER) += hpet.o
    obj-$(CONFIG_K8_NB) += k8.o

    diff --git a/arch/i386/kernel/early_printk.c b/arch/i386/kernel/early_printk.c
    deleted file mode 100644
    index 92f812b..0000000
    --- a/arch/i386/kernel/early_printk.c
    +++ /dev/null
    @@ -1,2 +0,0 @@
    -
    -#include "../../x86_64/kernel/early_printk.c"
    diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
    new file mode 100644
    index 0000000..55f268f
    --- /dev/null
    +++ b/arch/x86/kernel/Makefile
    @@ -0,0 +1,2 @@
    +
    +obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
    diff --git a/arch/x86_64/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
    similarity index 100%
    rename from arch/x86_64/kernel/early_printk.c
    rename to arch/x86/kernel/early_printk.c
    diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile
    index 2941a91..3cf9198 100644
    --- a/arch/x86_64/Makefile
    +++ b/arch/x86_64/Makefile
    @@ -79,6 +79,7 @@ head-y := arch/x86_64/kernel/head.o arch/x86_64/kernel/head64.o arch/x86_64/kern

    libs-y += arch/x86_64/lib/
    core-y += arch/x86_64/kernel/ \
    + arch/x86/kernel/ \
    arch/x86_64/mm/ \
    arch/x86_64/crypto/
    core-$(CONFIG_IA32_EMULATION) += arch/x86_64/ia32/
    diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
    index bb47e86..8b2535c 100644
    --- a/arch/x86_64/kernel/Makefile
    +++ b/arch/x86_64/kernel/Makefile
    @@ -28,7 +28,6 @@ obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
    obj-$(CONFIG_PM) += suspend.o
    obj-$(CONFIG_SOFTWARE_SUSPEND) += suspend_asm.o
    obj-$(CONFIG_CPU_FREQ) += cpufreq/
    -obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
    obj-$(CONFIG_IOMMU) += pci-gart.o aperture.o
    obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary.o tce.o
    obj-$(CONFIG_SWIOTLB) += pci-swiotlb.o
    diff --git a/arch/i386/Makefile b/arch/i386/Makefile
    index bd28f9f..d73a830 100644
    --- a/arch/i386/Makefile
    +++ b/arch/i386/Makefile
    @@ -100,6 +100,7 @@ head-y := arch/i386/kernel/head.o arch/i386/kernel/init_task.o

    libs-y += arch/i386/lib/
    core-y += arch/i386/kernel/ \
    + arch/x86/kernel/ \
    arch/i386/mm/ \
    arch/i386/$(mcore-y)/ \
    arch/i386/crypto/
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-03-15 06:23    [W:4.144 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site