diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/cpu/k8/mtrr.h | 10 | ||||
| -rw-r--r-- | src/include/device/device.h | 4 | ||||
| -rw-r--r-- | src/include/smp/atomic.h | 4 | ||||
| -rw-r--r-- | src/include/smp/spinlock.h | 4 |
4 files changed, 6 insertions, 16 deletions
diff --git a/src/include/cpu/k8/mtrr.h b/src/include/cpu/k8/mtrr.h index ce9e6d4d04..832df3b8d3 100644 --- a/src/include/cpu/k8/mtrr.h +++ b/src/include/cpu/k8/mtrr.h @@ -1,9 +1,8 @@ #ifndef CPU_K8_MTRR_H #define CPU_K8_MTRR_H -#include <cpu/k7/mtrr.h> +#include <cpu/p6/mtrr.h> -#if 0 #define IORR_FIRST 0xC0010016 #define IORR_LAST 0xC0010019 #define SYSCFG 0xC0010010 @@ -12,17 +11,12 @@ #define MTRR_WRITE_MEM (1 << 3) #define SYSCFG_MSR 0xC0010010 -#define SYSCFG_MSR_EvictEn (1 << 22) #define SYSCFG_MSR_TOM2En (1 << 21) #define SYSCFG_MSR_MtrrVarDramEn (1 << 20) #define SYSCFG_MSR_MtrrFixDramModEn (1 << 19) #define SYSCFG_MSR_MtrrFixDramEn (1 << 18) #define SYSCFG_MSR_UcLockEn (1 << 17) #define SYSCFG_MSR_ChxToDirtyDis (1 << 16) -#define SYSCFG_MSR_SysEccEn (1 << 15) -#define SYSCFG_MSR_RdBlkL2WayEn (1 << 14) -#define SYSCFG_MSR_SysFillValIsD1 (1 << 13) -#define SYSCFG_MSR_IcInclusive (1 << 12) #define SYSCFG_MSR_ClVicBlkEn (1 << 11) #define SYSCFG_MSR_SetDirtyEnO (1 << 10) #define SYSCFG_MSR_SetDirtyEnS (1 << 9) @@ -40,6 +34,4 @@ #define TOP_MEM2 0xC001001D #define HWCR_MSR 0xC0010015 -#endif - #endif /* CPU_K8_MTRR_H */ diff --git a/src/include/device/device.h b/src/include/device/device.h index 4ad776ffc9..d5013f15da 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -17,7 +17,7 @@ struct device_operations { #define MAX_RESOURCES 6 /* - * There is one pci_dev structure for each slot-number/function-number + * There is one device structure for each slot-number/function-number * combination: */ @@ -75,8 +75,6 @@ void compute_allocate_resource(device_t bus, struct resource *bridge, unsigned long type_mask, unsigned long type); void assign_resources(device_t bus); void enumerate_static_device(void); -unsigned long device_memory_base; - /* Helper functions */ device_t dev_find_device (unsigned int vendor, unsigned int device, device_t from); diff --git a/src/include/smp/atomic.h b/src/include/smp/atomic.h index b36e0e2051..4748990f12 100644 --- a/src/include/smp/atomic.h +++ b/src/include/smp/atomic.h @@ -1,7 +1,7 @@ #ifndef SMP_ATOMIC_H #define SMP_ATOMIC_H -#ifdef SMP +#ifdef CONFIG_SMP #include <arch/smp/atomic.h> #else @@ -48,6 +48,6 @@ typedef struct { int counter; } atomic_t; #define atomic_dec(v) (((v)->counter)--) -#endif /* SMP */ +#endif /* CONFIG_SMP */ #endif /* SMP_ATOMIC_H */ diff --git a/src/include/smp/spinlock.h b/src/include/smp/spinlock.h index 9e0f8af0a9..77a0e51682 100644 --- a/src/include/smp/spinlock.h +++ b/src/include/smp/spinlock.h @@ -1,9 +1,9 @@ #ifndef SMP_SPINLOCK_H #define SMP_SPINLOCK_H -#ifdef SMP +#ifdef CONFIG_SMP #include <arch/smp/spinlock.h> -#else /* !SMP */ +#else /* !CONFIG_SMP */ /* Most GCC versions have a nasty bug with empty initializers */ #if (__GNUC__ > 2) |