Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23ac4ae8 authored by Andreas Herrmann's avatar Andreas Herrmann Committed by H. Peter Anvin
Browse files

x86, k8: Rename k8.[ch] to amd_nb.[ch] and CONFIG_K8_NB to CONFIG_AMD_NB 



The file names are somehow misleading as the code is not specific to
AMD K8 CPUs anymore. The files accomodate code for other AMD CPU
northbridges as well.

Same is true for the config option which is valid for AMD CPU
northbridges in general and not specific to K8.

Signed-off-by: default avatarAndreas Herrmann <andreas.herrmann3@amd.com>
LKML-Reference: <20100917160343.GD4958@loge.amd.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 900f9ac9

arch/x86/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ config GART_IOMMU 
	bool "GART IOMMU support" if EMBEDDED

	default y

	select SWIOTLB

	depends on X86_64 && PCI && K8_NB

	depends on X86_64 && PCI && AMD_NB

	---help---

	  Support for full DMA access of devices with 32bit memory access only

	  on systems with more than 3GB. This is usually needed for USB,
@@ -2076,7 +2076,7 @@ config OLPC_OPENFIRMWARE 


endif # X86_32



config K8_NB

config AMD_NB

	def_bool y

	depends on CPU_SUP_AMD && PCI

arch/x86/include/asm/k8.h→arch/x86/include/asm/amd_nb.h

+4 −4
Original line number Diff line number Diff line 
#ifndef _ASM_X86_K8_H

#define _ASM_X86_K8_H

#ifndef _ASM_X86_AMD_NB_H

#define _ASM_X86_AMD_NB_H



#include <linux/pci.h>
@@ -20,7 +20,7 @@ struct k8_northbridge_info { 
};

extern struct k8_northbridge_info k8_northbridges;



#ifdef CONFIG_K8_NB

#ifdef CONFIG_AMD_NB



static inline struct pci_dev *node_to_k8_nb_misc(int node)

{
@@ -36,4 +36,4 @@ static inline struct pci_dev *node_to_k8_nb_misc(int node) 
#endif





#endif /* _ASM_X86_K8_H */
 
#endif /* _ASM_X86_AMD_NB_H */

arch/x86/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o 
obj-$(CONFIG_HPET_TIMER) 	+= hpet.o

obj-$(CONFIG_APB_TIMER)		+= apb_timer.o



obj-$(CONFIG_K8_NB)		+= k8.o

obj-$(CONFIG_AMD_NB)		+= amd_nb.o

obj-$(CONFIG_DEBUG_RODATA_TEST)	+= test_rodata.o

obj-$(CONFIG_DEBUG_NX_TEST)	+= test_nx.o

arch/x86/kernel/k8.c→arch/x86/kernel/amd_nb.c

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#include <linux/errno.h>

#include <linux/module.h>

#include <linux/spinlock.h>

#include <asm/k8.h>

#include <asm/amd_nb.h>



static u32 *flush_words;

arch/x86/kernel/aperture_64.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <asm/gart.h>

#include <asm/pci-direct.h>

#include <asm/dma.h>

#include <asm/k8.h>

#include <asm/amd_nb.h>

#include <asm/x86_init.h>



int gart_iommu_aperture;