WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [linux-2.6.18-xen] Import upstream git commit e9dff0ee66

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [linux-2.6.18-xen] Import upstream git commit e9dff0ee6694b2edd40b1b448cb786f6a7b02336
From: "Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>
Date: Wed, 08 Oct 2008 15:00:11 -0700
Delivery-date: Wed, 08 Oct 2008 15:00:04 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1223471565 -3600
# Node ID 18f976ebc8703be0ef0dc086d344dedc7012b0b7
# Parent  1ab88d39e2c7ce64984773643c0fb4868b121ee7
Import upstream git commit e9dff0ee6694b2edd40b1b448cb786f6a7b02336

    [PATCH] i386: mark cpu cache functions as __cpuinit

    Mark i386-specific cpu cache functions as __cpuinit. They are all
    only called from arch/i386/common.c:display_cache_info() that
    already is marked as __cpuinit.

    Signed-off-by: Magnus Damm <magnus@xxxxxxxxxxxxx>
    Signed-off-by: Andi Kleen <ak@xxxxxxx>
---
 arch/i386/kernel/cpu/amd.c     |    2 +-
 arch/i386/kernel/cpu/centaur.c |    2 +-
 arch/i386/kernel/cpu/intel.c   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff -r 1ab88d39e2c7 -r 18f976ebc870 arch/i386/kernel/cpu/amd.c
--- a/arch/i386/kernel/cpu/amd.c        Wed Oct 08 14:12:22 2008 +0100
+++ b/arch/i386/kernel/cpu/amd.c        Wed Oct 08 14:12:45 2008 +0100
@@ -246,7 +246,7 @@ static void __init init_amd(struct cpuin
                num_cache_leaves = 3;
 }
 
-static unsigned int amd_size_cache(struct cpuinfo_x86 * c, unsigned int size)
+static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 * c, unsigned 
int size)
 {
        /* AMD errata T13 (order #21922) */
        if ((c->x86 == 6)) {
diff -r 1ab88d39e2c7 -r 18f976ebc870 arch/i386/kernel/cpu/centaur.c
--- a/arch/i386/kernel/cpu/centaur.c    Wed Oct 08 14:12:22 2008 +0100
+++ b/arch/i386/kernel/cpu/centaur.c    Wed Oct 08 14:12:45 2008 +0100
@@ -442,7 +442,7 @@ static void __init init_centaur(struct c
        }
 }
 
-static unsigned int centaur_size_cache(struct cpuinfo_x86 * c, unsigned int 
size)
+static unsigned int __cpuinit centaur_size_cache(struct cpuinfo_x86 * c, 
unsigned int size)
 {
        /* VIA C3 CPUs (670-68F) need further shifting. */
        if ((c->x86 == 6) && ((c->x86_model == 7) || (c->x86_model == 8)))
diff -r 1ab88d39e2c7 -r 18f976ebc870 arch/i386/kernel/cpu/intel.c
--- a/arch/i386/kernel/cpu/intel.c      Wed Oct 08 14:12:22 2008 +0100
+++ b/arch/i386/kernel/cpu/intel.c      Wed Oct 08 14:12:45 2008 +0100
@@ -198,7 +198,7 @@ static void __cpuinit init_intel(struct 
 }
 
 
-static unsigned int intel_size_cache(struct cpuinfo_x86 * c, unsigned int size)
+static unsigned int __cpuinit intel_size_cache(struct cpuinfo_x86 * c, 
unsigned int size)
 {
        /* Intel PIII Tualatin. This comes in two flavours.
         * One has 256kb of cache, the other 512. We have no way

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [linux-2.6.18-xen] Import upstream git commit e9dff0ee6694b2edd40b1b448cb786f6a7b02336, Xen patchbot-linux-2.6.18-xen <=