{"id":235,"url":"http://patchwork.ozlabs.org/api/1.0/patches/235/?format=json","project":{"id":1,"url":"http://patchwork.ozlabs.org/api/1.0/projects/1/?format=json","name":"Cell Broadband Engine development","link_name":"cbe-oss-dev","list_id":"cbe-oss-dev.ozlabs.org","list_email":"cbe-oss-dev@ozlabs.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<48C8771E.40502@am.sony.com>","date":"2008-09-11T01:40:46","name":"Fix ppc64 build warnings","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"a03ec88a26ddf97b9b8998b146cc04617138b2e0","submitter":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.0/people/34/?format=json","name":"Geoff Levand","email":"geoffrey.levand@am.sony.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/cbe-oss-dev/patch/48C8771E.40502@am.sony.com/mbox/","series":[],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/235/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":["patchwork@ozlabs.org","cbe-oss-dev@ozlabs.org"],"Delivered-To":["patchwork@ozlabs.org","cbe-oss-dev@ozlabs.org"],"Received":["from ozlabs.org (localhost [127.0.0.1])\n\tby ozlabs.org (Postfix) with ESMTP id 2804FDE206\n\tfor ; Thu, 11 Sep 2008 11:42:13 +1000 (EST)","from SG2EHSOBE001.bigfish.com (outbound-sin.frontbridge.com\n\t[207.46.51.80]) by ozlabs.org (Postfix) with ESMTP id 5C038DE115\n\tfor ; Thu, 11 Sep 2008 11:41:00 +1000 (EST)","from mail123-sin-R.bigfish.com (10.3.40.3) by\n\tSG2EHSOBE001.bigfish.com (10.3.40.21) with Microsoft SMTP Server id\n\t8.1.291.1; Thu, 11 Sep 2008 01:40:57 +0000","from mail123-sin (localhost.localdomain [127.0.0.1])\tby\n\tmail123-sin-R.bigfish.com (Postfix) with ESMTP id DA2351900550;\n\tThu, 11 Sep 2008 01:40:56 +0000 (UTC)","by mail123-sin (MessageSwitch) id 1221097255124242_28693; Thu, 11\n\tSep 2008 01:40:55 +0000 (UCT)","from mail8.fw-bc.sony.com (mail8.fw-bc.sony.com [160.33.98.75])\tby\n\tmail123-sin.bigfish.com (Postfix) with ESMTP id 8DC2A590067;\n\tThu, 11 Sep 2008 01:40:54 +0000 (UTC)","from mail3.sjc.in.sel.sony.com (mail3.sjc.in.sel.sony.com\n\t[43.134.1.211])\tby mail8.fw-bc.sony.com (8.14.2/8.14.2) with ESMTP id\n\tm8B1eqwU016677;\tThu, 11 Sep 2008 01:40:53 GMT","from USSDIXIM01.am.sony.com (ussdixim01.am.sony.com\n\t[43.130.140.33])\n\tby mail3.sjc.in.sel.sony.com (8.12.11/8.12.11) with ESMTP id\n\tm8B1elgo001822; Thu, 11 Sep 2008 01:40:47 GMT","from ussdixms03.am.sony.com ([43.130.140.23]) by\n\tUSSDIXIM01.am.sony.com with Microsoft SMTPSVC(5.0.2195.6713);\n\tWed, 10 Sep 2008 18:40:47 -0700","from [192.168.1.10] ([43.135.148.226]) by ussdixms03.am.sony.com\n\twith Microsoft SMTPSVC(5.0.2195.6713); Wed, 10 Sep 2008 18:40:46 -0700"],"X-BigFish":"VPS5(zzzz10d3izz4ee3lz2fh6bh66h)","X-Spam-TCS-SCL":"5:0","Message-ID":"<48C8771E.40502@am.sony.com>","Date":"Wed, 10 Sep 2008 18:40:46 -0700","From":"Geoff Levand ","User-Agent":"Thunderbird 2.0.0.16 (X11/20080723)","MIME-Version":"1.0","To":"horms@verge.net.au","X-Enigmail-Version":"0.95.7","X-OriginalArrivalTime":"11 Sep 2008 01:40:46.0652 (UTC)\n\tFILETIME=[69791FC0:01C913AF]","X-SEL-encryption-scan":"scanned","Cc":"kexec@lists.infradead.org,\n\tCell Broadband Engine OSS Development ","Subject":"[Cbe-oss-dev] [kexec patch 2/2] Fix ppc64 build warnings","X-BeenThere":"cbe-oss-dev@ozlabs.org","X-Mailman-Version":"2.1.11","Precedence":"list","List-Id":"Discussion about Open Source Software for the Cell Broadband Engine\n\t","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"cbe-oss-dev-bounces+patchwork=ozlabs.org@ozlabs.org","Errors-To":"cbe-oss-dev-bounces+patchwork=ozlabs.org@ozlabs.org"},"content":"Fix these ppc64 32 bit build warnings:\n\n kexec/arch/ppc64/kexec-zImage-ppc64.c: In function 'zImage_ppc64_load':\n kexec/arch/ppc64/kexec-zImage-ppc64.c:164: warning: cast to pointer from integer of different size\n kexec/arch/ppc64/kexec-elf-ppc64.c: In function 'elf_ppc64_load':\n kexec/arch/ppc64/kexec-elf-ppc64.c:121: warning: integer constant is too large for 'unsigned long' type\n kexec/arch/ppc64/kexec-elf-ppc64.c:237: warning: cast from pointer to integer of different size\n kexec/arch/ppc64/kexec-elf-ppc64.c:276: warning: cast from pointer to integer of different size\n kexec/arch/ppc64/kexec-elf-ppc64.c:283: warning: cast from pointer to integer of different size\n kexec/arch/ppc64/kexec-elf-ppc64.c:287: warning: cast from pointer to integer of different size\n kexec/arch/ppc64/kexec-elf-ppc64.c:341: warning: format '%lx' expects type 'long unsigned int', but argument 3 has type 'uint64_t'\n kexec/arch/ppc64/kexec-elf-ppc64.c:352: warning: format '%ld' expects type 'long int', but argument 5 has type 'size_t'\n kexec/arch/ppc64/crashdump-ppc64.c:45: warning: integer constant is too large for 'long' type\n kexec/arch/ppc64/crashdump-ppc64.c:46: warning: integer constant is too large for 'long' type\n kexec/arch/ppc64/crashdump-ppc64.c:56: warning: integer constant is too large for 'long' type\n kexec/arch/ppc64/crashdump-ppc64.c:57: warning: integer constant is too large for 'long' type\n\nTested on PS3 (ppc64) with 32 and 64 bit builds. \n\nSigned-off-by: Geoff Levand ","diff":"--- a/kexec/arch/ppc64/crashdump-ppc64.h\n+++ b/kexec/arch/ppc64/crashdump-ppc64.h\n@@ -6,9 +6,9 @@ int load_crashdump_segments(struct kexec\n \t\t\t\tuint64_t max_addr, unsigned long min_base);\n void add_usable_mem_rgns(unsigned long long base, unsigned long long size);\n \n-#define PAGE_OFFSET 0xC000000000000000\n+#define PAGE_OFFSET 0xC000000000000000ULL\n #define KERNELBASE PAGE_OFFSET\n-#define VMALLOCBASE 0xD000000000000000\n+#define VMALLOCBASE 0xD000000000000000ULL\n \n #define __pa(x) ((unsigned long)(x)-PAGE_OFFSET)\n #define MAXMEM (-KERNELBASE-VMALLOCBASE)\n--- a/kexec/arch/ppc64/kexec-elf-ppc64.c\n+++ b/kexec/arch/ppc64/kexec-elf-ppc64.c\n@@ -118,7 +118,7 @@ int elf_ppc64_load(int argc, char **argv\n \tcmdline = 0;\n \tramdisk = 0;\n \tdevicetreeblob = 0;\n-\tmax_addr = 0xFFFFFFFFFFFFFFFFUL;\n+\tmax_addr = 0xFFFFFFFFFFFFFFFFULL;\n \thole_addr = 0;\n \n \twhile ((opt = getopt_long(argc, argv, short_options,\n@@ -233,7 +233,7 @@ int elf_ppc64_load(int argc, char **argv\n \t\t}\n \t\tseg_buf = (unsigned char *)slurp_file(ramdisk, &seg_size);\n \t\tadd_buffer(info, seg_buf, seg_size, seg_size, 0, 0, max_addr, 1);\n-\t\thole_addr = (uint64_t)\n+\t\thole_addr = (uintptr_t)\n \t\t\tinfo->segment[info->nr_segments-1].mem;\n \t\tinitrd_base = hole_addr;\n \t\tinitrd_size = (uint64_t)\n@@ -272,7 +272,7 @@ int elf_ppc64_load(int argc, char **argv\n \twhile (*rsvmap_ptr || *(rsvmap_ptr+1))\n \t\trsvmap_ptr += 2;\n \trsvmap_ptr -= 2;\n-\t*rsvmap_ptr = (uint64_t)(\n+\t*rsvmap_ptr = (uintptr_t)(\n \t\tinfo->segment[(info->nr_segments)-1].mem);\n \trsvmap_ptr++;\n \t*rsvmap_ptr = (uint64_t)bb_ptr->totalsize;\n@@ -280,11 +280,11 @@ int elf_ppc64_load(int argc, char **argv\n \tnr_segments = info->nr_segments;\n \n \t/* Set kernel */\n-\tmy_kernel = (uint64_t)info->segment[0].mem;\n+\tmy_kernel = (uintptr_t)info->segment[0].mem;\n \telf_rel_set_symbol(&info->rhdr, \"kernel\", &my_kernel, sizeof(my_kernel));\n \n \t/* Set dt_offset */\n-\tmy_dt_offset = (uint64_t)info->segment[nr_segments-1].mem;\n+\tmy_dt_offset = (uintptr_t)info->segment[nr_segments-1].mem;\n \telf_rel_set_symbol(&info->rhdr, \"dt_offset\", &my_dt_offset,\n \t\t\t\tsizeof(my_dt_offset));\n \n@@ -338,17 +338,19 @@ int elf_ppc64_load(int argc, char **argv\n \t\t\t\tsizeof(toc_addr));\n \n \tfprintf(stderr, \"info->entry is %p\\n\", info->entry);\n-\tfprintf(stderr, \"kernel is %lx\\n\", my_kernel);\n-\tfprintf(stderr, \"dt_offset is %lx\\n\", my_dt_offset);\n+\tfprintf(stderr, \"kernel is %llx\\n\", (unsigned long long)my_kernel);\n+\tfprintf(stderr, \"dt_offset is %llx\\n\",\n+\t\t(unsigned long long)my_dt_offset);\n \tfprintf(stderr, \"panic_kernel is %x\\n\", my_panic_kernel);\n-\tfprintf(stderr, \"backup_start is %lx\\n\", my_backup_start);\n-\tfprintf(stderr, \"stack is %lx\\n\", my_stack);\n-\tfprintf(stderr, \"toc_addr is %lx\\n\", toc_addr);\n-\tfprintf(stderr, \"purgatory size is %lu\\n\", purgatory_size);\n+\tfprintf(stderr, \"backup_start is %llx\\n\",\n+\t\t(unsigned long long)my_backup_start);\n+\tfprintf(stderr, \"stack is %llx\\n\", (unsigned long long)my_stack);\n+\tfprintf(stderr, \"toc_addr is %llx\\n\", (unsigned long long)toc_addr);\n+\tfprintf(stderr, \"purgatory size is %zu\\n\", purgatory_size);\n #endif\n \n \tfor (i = 0; i < nr_segments; i++)\n-\t\tfprintf(stderr, \"segment[%d].mem:%p memsz:%ld\\n\", i,\n+\t\tfprintf(stderr, \"segment[%d].mem:%p memsz:%zu\\n\", i,\n \t\t\tinfo->segment[i].mem, info->segment[i].memsz);\n \n \treturn 0;\n--- a/kexec/arch/ppc64/kexec-zImage-ppc64.c\n+++ b/kexec/arch/ppc64/kexec-zImage-ppc64.c\n@@ -161,7 +161,7 @@ int zImage_ppc64_load(FILE *file, int ar\n \tsegment->mem = (void *) load_loc;\n \tsegment->memsz = memsize;\n \tsegment->bufsz = filesize;\n-\t*ret_entry = (void *)((uint64_t)elf.e_entry);\n+\t*ret_entry = (void *)(uintptr_t)elf.e_entry;\n \t*ret_nr_segments = i - 1;\n \tfree(ph);\n \treturn 0;\n","prefixes":[]}