diff options
author | Keith Packard <keithp@keithp.com> | 2011-06-29 17:34:54 (GMT) |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2011-06-29 17:34:54 (GMT) |
commit | 8eb2c0ee67f4853c0e433394f65ef8143a748c80 (patch) | |
tree | ea74ea0878b2f07eb70f2d5b42be5ec42f3bdb5f /arch/x86 | |
parent | 3e0dc6b01f5301d63046f6deddde2c7f5c57d67a (diff) | |
parent | 0d72c6fcb5cd215eeab824fac216ea42c5b574aa (diff) | |
download | linux-fsl-qoriq-8eb2c0ee67f4853c0e433394f65ef8143a748c80.tar.xz |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/include/asm/mmzone_32.h | 11 | ||||
-rw-r--r-- | arch/x86/include/asm/mmzone_64.h | 3 | ||||
-rw-r--r-- | arch/x86/pci/acpi.c | 2 |
3 files changed, 1 insertions, 15 deletions
diff --git a/arch/x86/include/asm/mmzone_32.h b/arch/x86/include/asm/mmzone_32.h index 5e83a41..224e8c5 100644 --- a/arch/x86/include/asm/mmzone_32.h +++ b/arch/x86/include/asm/mmzone_32.h @@ -48,17 +48,6 @@ static inline int pfn_to_nid(unsigned long pfn) #endif } -/* - * Following are macros that each numa implmentation must define. - */ - -#define node_start_pfn(nid) (NODE_DATA(nid)->node_start_pfn) -#define node_end_pfn(nid) \ -({ \ - pg_data_t *__pgdat = NODE_DATA(nid); \ - __pgdat->node_start_pfn + __pgdat->node_spanned_pages; \ -}) - static inline int pfn_valid(int pfn) { int nid = pfn_to_nid(pfn); diff --git a/arch/x86/include/asm/mmzone_64.h b/arch/x86/include/asm/mmzone_64.h index b3f88d7..129d9aa 100644 --- a/arch/x86/include/asm/mmzone_64.h +++ b/arch/x86/include/asm/mmzone_64.h @@ -13,8 +13,5 @@ extern struct pglist_data *node_data[]; #define NODE_DATA(nid) (node_data[nid]) -#define node_start_pfn(nid) (NODE_DATA(nid)->node_start_pfn) -#define node_end_pfn(nid) (NODE_DATA(nid)->node_start_pfn + \ - NODE_DATA(nid)->node_spanned_pages) #endif #endif /* _ASM_X86_MMZONE_64_H */ diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index 0972315..68c3c13 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c @@ -188,7 +188,7 @@ static bool resource_contains(struct resource *res, resource_size_t point) return false; } -static void coalesce_windows(struct pci_root_info *info, int type) +static void coalesce_windows(struct pci_root_info *info, unsigned long type) { int i, j; struct resource *res1, *res2; |