projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'x86-asm-2024-03-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
[linux-2.6-block.git]
/
arch
/
x86
/
kernel
/
amd_nb.c
diff --git
a/arch/x86/kernel/amd_nb.c
b/arch/x86/kernel/amd_nb.c
index 053f6dcc6b2c7026eb87c79f09b6d6a038aec628..5bf5f9fc5753a194fcc071b57af6184ad275a634 100644
(file)
--- a/
arch/x86/kernel/amd_nb.c
+++ b/
arch/x86/kernel/amd_nb.c
@@
-386,7
+386,7
@@
struct resource *amd_get_mmconfig_range(struct resource *res)
int amd_get_subcaches(int cpu)
{
int amd_get_subcaches(int cpu)
{
- struct pci_dev *link = node_to_amd_nb(topology_
di
e_id(cpu))->link;
+ struct pci_dev *link = node_to_amd_nb(topology_
amd_nod
e_id(cpu))->link;
unsigned int mask;
if (!amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
unsigned int mask;
if (!amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
@@
-400,7
+400,7
@@
int amd_get_subcaches(int cpu)
int amd_set_subcaches(int cpu, unsigned long mask)
{
static unsigned int reset, ban;
int amd_set_subcaches(int cpu, unsigned long mask)
{
static unsigned int reset, ban;
- struct amd_northbridge *nb = node_to_amd_nb(topology_
di
e_id(cpu));
+ struct amd_northbridge *nb = node_to_amd_nb(topology_
amd_nod
e_id(cpu));
unsigned int reg;
int cuid;
unsigned int reg;
int cuid;