forked from luck/tmp_suning_uos_patched
powerpc/ps3: ps3_repository_read_mm_info() takes u64 * arguments
Fixes compiler warnings: arch/powerpc/platforms/ps3/mm.c:1205: warning: passing argument 2 of 'ps3_repository_read_mm_info' from incompatible pointer type arch/powerpc/platforms/ps3/mm.c:1205: warning: passing argument 3 of 'ps3_repository_read_mm_info' from incompatible pointer type Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Geoff Levand <geoffrey.levand@am.sony.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
parent
46ca0d1539
commit
5418b9c671
|
@ -80,7 +80,7 @@ enum {
|
|||
|
||||
struct mem_region {
|
||||
u64 base;
|
||||
unsigned long size;
|
||||
u64 size;
|
||||
unsigned long offset;
|
||||
};
|
||||
|
||||
|
@ -103,7 +103,7 @@ struct mem_region {
|
|||
*/
|
||||
|
||||
struct map {
|
||||
unsigned long total;
|
||||
u64 total;
|
||||
u64 vas_id;
|
||||
u64 htab_size;
|
||||
struct mem_region rm;
|
||||
|
@ -114,13 +114,13 @@ struct map {
|
|||
static void __maybe_unused _debug_dump_map(const struct map *m,
|
||||
const char *func, int line)
|
||||
{
|
||||
DBG("%s:%d: map.total = %lxh\n", func, line, m->total);
|
||||
DBG("%s:%d: map.rm.size = %lxh\n", func, line, m->rm.size);
|
||||
DBG("%s:%d: map.total = %llxh\n", func, line, m->total);
|
||||
DBG("%s:%d: map.rm.size = %llxh\n", func, line, m->rm.size);
|
||||
DBG("%s:%d: map.vas_id = %llu\n", func, line, m->vas_id);
|
||||
DBG("%s:%d: map.htab_size = %llxh\n", func, line, m->htab_size);
|
||||
DBG("%s:%d: map.r1.base = %llxh\n", func, line, m->r1.base);
|
||||
DBG("%s:%d: map.r1.offset = %lxh\n", func, line, m->r1.offset);
|
||||
DBG("%s:%d: map.r1.size = %lxh\n", func, line, m->r1.size);
|
||||
DBG("%s:%d: map.r1.size = %llxh\n", func, line, m->r1.size);
|
||||
}
|
||||
|
||||
static struct map map;
|
||||
|
@ -240,10 +240,9 @@ static int ps3_mm_region_create(struct mem_region *r, unsigned long size)
|
|||
r->size = _ALIGN_DOWN(size, 1 << PAGE_SHIFT_16M);
|
||||
|
||||
DBG("%s:%d requested %lxh\n", __func__, __LINE__, size);
|
||||
DBG("%s:%d actual %lxh\n", __func__, __LINE__, r->size);
|
||||
DBG("%s:%d difference %lxh (%luMB)\n", __func__, __LINE__,
|
||||
(unsigned long)(size - r->size),
|
||||
(size - r->size) / 1024 / 1024);
|
||||
DBG("%s:%d actual %llxh\n", __func__, __LINE__, r->size);
|
||||
DBG("%s:%d difference %llxh (%lluMB)\n", __func__, __LINE__,
|
||||
size - r->size, (size - r->size) / 1024 / 1024);
|
||||
|
||||
if (r->size == 0) {
|
||||
DBG("%s:%d: size == 0\n", __func__, __LINE__);
|
||||
|
|
Loading…
Reference in New Issue
Block a user