From: Yinghai Lu <yinghai@kernel.org>
To: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>,
Christoph Lameter <cl@linux-foundation.org>,
linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org,
Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 05/35] x86/pci: use u64 instead of size_t in amd_bus.c
Date: Tue, 09 Feb 2010 11:32:16 -0800 [thread overview]
Message-ID: <1265743966-17065-6-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1265743966-17065-1-git-send-email-yinghai@kernel.org>
prepare to enable it for 32bit
-v2: remove not needed cast
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---
arch/x86/pci/amd_bus.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c
index e467071..e8bb553 100644
--- a/arch/x86/pci/amd_bus.c
+++ b/arch/x86/pci/amd_bus.c
@@ -82,8 +82,8 @@ static int __init early_fill_mp_bus_info(void)
struct pci_root_info *info;
u32 reg;
struct resource *res;
- size_t start;
- size_t end;
+ u64 start;
+ u64 end;
struct range range[RANGE_NUM];
u64 val;
u32 address;
@@ -173,7 +173,7 @@ static int __init early_fill_mp_bus_info(void)
info = &pci_root_info[j];
printk(KERN_DEBUG "node %d link %d: io port [%llx, %llx]\n",
- node, link, (u64)start, (u64)end);
+ node, link, start, end);
/* kernel only handle 16 bit only */
if (end > 0xffff)
@@ -207,7 +207,7 @@ static int __init early_fill_mp_bus_info(void)
address = MSR_K8_TOP_MEM1;
rdmsrl(address, val);
end = (val & 0xffffff800000ULL);
- printk(KERN_INFO "TOM: %016lx aka %ldM\n", end, end>>20);
+ printk(KERN_INFO "TOM: %016llx aka %lldM\n", end, end>>20);
if (end < (1ULL<<32))
subtract_range(range, RANGE_NUM, 0, end - 1);
@@ -246,7 +246,7 @@ static int __init early_fill_mp_bus_info(void)
info = &pci_root_info[j];
printk(KERN_DEBUG "node %d link %d: mmio [%llx, %llx]",
- node, link, (u64)start, (u64)end);
+ node, link, start, end);
/*
* some sick allocation would have range overlap with fam10h
* mmconf range, so need to update start and end.
@@ -272,13 +272,13 @@ static int __init early_fill_mp_bus_info(void)
endx = fam10h_mmconf_start - 1;
update_res(info, start, endx, IORESOURCE_MEM, 0);
subtract_range(range, RANGE_NUM, start, endx);
- printk(KERN_CONT " ==> [%llx, %llx]", (u64)start, endx);
+ printk(KERN_CONT " ==> [%llx, %llx]", start, endx);
start = fam10h_mmconf_end + 1;
changed = 1;
}
if (changed) {
if (start <= end) {
- printk(KERN_CONT " %s [%llx, %llx]", endx?"and":"==>", (u64)start, (u64)end);
+ printk(KERN_CONT " %s [%llx, %llx]", endx?"and":"==>", start, end);
} else {
printk(KERN_CONT "%s\n", endx?"":" ==> none");
continue;
@@ -301,7 +301,7 @@ static int __init early_fill_mp_bus_info(void)
address = MSR_K8_TOP_MEM2;
rdmsrl(address, val);
end = (val & 0xffffff800000ULL);
- printk(KERN_INFO "TOM2: %016lx aka %ldM\n", end, end>>20);
+ printk(KERN_INFO "TOM2: %016llx aka %lldM\n", end, end>>20);
subtract_range(range, RANGE_NUM, 1ULL<<32, end - 1);
}
--
1.6.4.2
next prev parent reply other threads:[~2010-02-09 19:38 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-09 19:32 [PATCH -v6 0/35] x86: not use bootmem for x86 Yinghai Lu
2010-02-09 19:32 ` [PATCH 01/35] x86: fix sci on ioapic 1 Yinghai Lu
2010-02-09 19:32 ` [PATCH 02/35] x86: move range related operation to one file Yinghai Lu
2010-02-09 19:32 ` [PATCH 03/35] x86/pci: use resource_size_t in update_res Yinghai Lu
2010-02-09 19:32 ` [PATCH 04/35] x86/pci: amd one chain system to use pci read out res Yinghai Lu
2010-02-09 19:54 ` Andrew Morton
2010-02-09 19:32 ` Yinghai Lu [this message]
2010-02-09 19:32 ` [PATCH 06/35] x86/pci: add cap_resource Yinghai Lu
2010-02-09 19:56 ` Andrew Morton
2010-02-09 19:32 ` [PATCH 07/35] x86/pci: enable pci root res read out for 32bit too Yinghai Lu
2010-02-09 19:32 ` [PATCH 08/35] x86: change range end to start+size Yinghai Lu
2010-02-09 19:32 ` [PATCH 09/35] x86: print out for RAM buffer Yinghai Lu
2010-02-09 19:52 ` Andrew Morton
2010-02-10 21:19 ` H. Peter Anvin
2010-02-09 19:32 ` [PATCH 10/35] x86: call early_res_to_bootmem one time Yinghai Lu
2010-02-09 19:32 ` [PATCH 11/35] x86: introduce max_early_res and early_res_count Yinghai Lu
2010-02-09 19:32 ` [PATCH 12/35] x86: dynamic increase early_res array size Yinghai Lu
2010-02-09 19:32 ` [PATCH 13/35] x86: make early_node_mem get mem > 4g if possible Yinghai Lu
2010-02-09 19:32 ` [PATCH 14/35] x86: only call dma32_reserve_bootmem 64bit !CONFIG_NUMA Yinghai Lu
2010-02-09 19:32 ` [PATCH 15/35] x86: make 64 bit use early_res instead of bootmem before slab Yinghai Lu
2010-02-09 20:26 ` Andrew Morton
2010-02-09 21:37 ` Yinghai Lu
2010-02-09 21:45 ` H. Peter Anvin
2010-02-09 21:47 ` H. Peter Anvin
2010-02-09 22:33 ` Andrew Morton
2010-02-09 22:44 ` H. Peter Anvin
2010-02-09 20:30 ` Andrew Morton
2010-02-09 19:32 ` [PATCH 16/35] sparsemem: put usemap for one node together Yinghai Lu
2010-02-09 19:32 ` [PATCH 17/35] sparsemem: put mem map " Yinghai Lu
2010-02-09 20:21 ` Andrew Morton
2010-02-09 19:32 ` [PATCH 18/35] x86: move bios page reserve early to head32/64.c Yinghai Lu
2010-02-09 19:32 ` [PATCH 19/35] x86: seperate early_res related code from e820.c Yinghai Lu
2010-02-09 19:32 ` [PATCH 20/35] x86: add find_early_area_size Yinghai Lu
2010-02-09 19:32 ` [PATCH 21/35] x86: move back find_e820_area to e820.c Yinghai Lu
2010-02-09 20:15 ` Andrew Morton
2010-02-09 19:32 ` [PATCH 22/35] early_res: enhance check_and_double_early_res Yinghai Lu
2010-02-09 19:32 ` [PATCH 23/35] x86: make 32bit support NO_BOOTMEM Yinghai Lu
2010-02-09 20:03 ` Andrew Morton
2010-02-09 19:32 ` [PATCH 24/35] move round_up/down to kernel.h Yinghai Lu
2010-02-09 19:32 ` [PATCH 25/35] x86: add find_fw_memmap_area Yinghai Lu
2010-02-09 19:32 ` [PATCH 26/35] core: move early_res Yinghai Lu
2010-02-09 19:32 ` [PATCH 27/35] irq: remove not need bootmem code Yinghai Lu
2010-02-09 19:32 ` [PATCH 28/35] radix: move radix init early Yinghai Lu
2010-02-09 19:49 ` Andrew Morton
2010-02-09 19:56 ` Pekka Enberg
2010-02-10 0:16 ` Yinghai Lu
2010-02-10 10:05 ` Pekka Enberg
2010-02-11 5:29 ` Benjamin Herrenschmidt
2010-02-09 19:32 ` [PATCH 29/35] sparseirq: change irq_desc_ptrs to static Yinghai Lu
2010-02-09 19:32 ` [PATCH 30/35] sparseirq: use radix_tree instead of ptrs array Yinghai Lu
2010-02-09 19:32 ` [PATCH 31/35] x86: remove arch_probe_nr_irqs Yinghai Lu
2010-02-09 19:32 ` [PATCH 32/35] use nr_cpus= to set nr_cpu_ids early Yinghai Lu
2010-02-09 20:05 ` Andrew Morton
2010-02-09 19:32 ` [PATCH 33/35] x86: according to nr_cpu_ids to decide if need to leave logical flat Yinghai Lu
2010-02-09 19:32 ` [PATCH 34/35] x86: make 32bit apic flat to physflat switch like 64bit Yinghai Lu
2010-02-09 19:32 ` [PATCH 35/35] x86: use num_processors for possible cpus Yinghai Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1265743966-17065-6-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=cl@linux-foundation.org \
--cc=hpa@zytor.com \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome