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 12/20] mtrr directory switch
    Move the mtrr directory over to the common area.

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

    diff --git a/arch/i386/kernel/cpu/Makefile b/arch/i386/kernel/cpu/Makefile
    index 010aecf..f8eaef8 100644
    --- a/arch/i386/kernel/cpu/Makefile
    +++ b/arch/i386/kernel/cpu/Makefile
    @@ -15,5 +15,4 @@ obj-y += umc.o

    obj-$(CONFIG_X86_MCE) += mcheck/

    -obj-$(CONFIG_MTRR) += mtrr/
    obj-$(CONFIG_CPU_FREQ) += cpufreq/
    diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
    index 3e15c9e..c1a2b58 100644
    --- a/arch/x86/kernel/Makefile
    +++ b/arch/x86/kernel/Makefile
    @@ -1,5 +1,7 @@
    obj-y += bootflag.o quirks.o i8237.o topology.o alternative.o

    +obj-y += cpu/
    +
    obj-$(CONFIG_X86_MSR) += msr.o
    obj-$(CONFIG_X86_CPUID) += cpuid.o
    obj-$(CONFIG_MICROCODE) += microcode.o
    diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
    new file mode 100644
    index 0000000..3e59ae7
    --- /dev/null
    +++ b/arch/x86/kernel/cpu/Makefile
    @@ -0,0 +1,2 @@
    +
    +obj-$(CONFIG_MTRR) += mtrr/
    diff --git a/arch/i386/kernel/cpu/mtrr/Makefile b/arch/x86/kernel/cpu/mtrr/Makefile
    similarity index 100%
    rename from arch/i386/kernel/cpu/mtrr/Makefile
    rename to arch/x86/kernel/cpu/mtrr/Makefile
    diff --git a/arch/i386/kernel/cpu/mtrr/amd.c b/arch/x86/kernel/cpu/mtrr/amd.c
    similarity index 100%
    rename from arch/i386/kernel/cpu/mtrr/amd.c
    rename to arch/x86/kernel/cpu/mtrr/amd.c
    diff --git a/arch/i386/kernel/cpu/mtrr/centaur.c b/arch/x86/kernel/cpu/mtrr/centaur.c
    similarity index 100%
    rename from arch/i386/kernel/cpu/mtrr/centaur.c
    rename to arch/x86/kernel/cpu/mtrr/centaur.c
    diff --git a/arch/i386/kernel/cpu/mtrr/cyrix.c b/arch/x86/kernel/cpu/mtrr/cyrix.c
    similarity index 100%
    rename from arch/i386/kernel/cpu/mtrr/cyrix.c
    rename to arch/x86/kernel/cpu/mtrr/cyrix.c
    diff --git a/arch/i386/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
    similarity index 100%
    rename from arch/i386/kernel/cpu/mtrr/generic.c
    rename to arch/x86/kernel/cpu/mtrr/generic.c
    diff --git a/arch/i386/kernel/cpu/mtrr/if.c b/arch/x86/kernel/cpu/mtrr/if.c
    similarity index 100%
    rename from arch/i386/kernel/cpu/mtrr/if.c
    rename to arch/x86/kernel/cpu/mtrr/if.c
    diff --git a/arch/i386/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
    similarity index 100%
    rename from arch/i386/kernel/cpu/mtrr/main.c
    rename to arch/x86/kernel/cpu/mtrr/main.c
    diff --git a/arch/i386/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
    similarity index 100%
    rename from arch/i386/kernel/cpu/mtrr/mtrr.h
    rename to arch/x86/kernel/cpu/mtrr/mtrr.h
    diff --git a/arch/i386/kernel/cpu/mtrr/state.c b/arch/x86/kernel/cpu/mtrr/state.c
    similarity index 100%
    rename from arch/i386/kernel/cpu/mtrr/state.c
    rename to arch/x86/kernel/cpu/mtrr/state.c
    diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
    index 3fae694..60918ad 100644
    --- a/arch/x86_64/kernel/Makefile
    +++ b/arch/x86_64/kernel/Makefile
    @@ -14,7 +14,6 @@ obj-$(CONFIG_STACKTRACE) += stacktrace.o
    obj-$(CONFIG_X86_MCE) += mce.o therm_throt.o
    obj-$(CONFIG_X86_MCE_INTEL) += mce_intel.o
    obj-$(CONFIG_X86_MCE_AMD) += mce_amd.o
    -obj-$(CONFIG_MTRR) += ../../i386/kernel/cpu/mtrr/
    obj-$(CONFIG_ACPI) += acpi/
    obj-$(CONFIG_SMP) += smp.o smpboot.o trampoline.o
    obj-y += apic.o nmi.o
    --
    -
    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:29    [W:0.026 / U:91.068 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site