diff options
| author | Daniel J Blueman <daniel@numascale-asia.com> | 2012-11-27 14:32:10 +0800 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2013-01-10 16:17:58 +0100 |
| commit | 8b84c8df38d5796da2e8cd051666d203ddabcb62 (patch) | |
| tree | 58a5a8f81311841c887c5c2118667a062ec7e31f /drivers/edac/amd64_edac.c | |
| parent | 772c3ff385eda0d0b4744596f87b79a17f8c9282 (diff) | |
| download | linux-8b84c8df38d5796da2e8cd051666d203ddabcb62.tar.bz2 | |
x86, AMD, NB: Use u16 for northbridge IDs in amd_get_nb_id
Change amd_get_nb_id to return u16 to support >255 memory controllers,
and related consistency fixes.
Signed-off-by: Daniel J Blueman <daniel@numascale-asia.com>
Link: http://lkml.kernel.org/r/1353997932-8475-2-git-send-email-daniel@numascale-asia.com
Signed-off-by: Borislav Petkov <bp@alien8.de>
Diffstat (limited to 'drivers/edac/amd64_edac.c')
| -rw-r--r-- | drivers/edac/amd64_edac.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index a3fe39b1f78b..29be39d02076 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -939,7 +939,8 @@ static u64 get_error_address(struct mce *m) struct amd64_pvt *pvt; u64 cc6_base, tmp_addr; u32 tmp; - u8 mce_nid, intlv_en; + u16 mce_nid; + u8 intlv_en; if ((addr & GENMASK(24, 47)) >> 24 != 0x00fdf7) return addr; @@ -2181,7 +2182,7 @@ static int init_csrows(struct mem_ctl_info *mci) } /* get all cores on this DCT */ -static void get_cpus_on_this_dct_cpumask(struct cpumask *mask, unsigned nid) +static void get_cpus_on_this_dct_cpumask(struct cpumask *mask, u16 nid) { int cpu; |