Skip to content

Commit fe33332

Browse files
Ingo Molnarozbenh
Ingo Molnar
authored and
ozbenh
committed
powerpc: Change u64/s64 to a long long integer type
Convert arch/powerpc/ over to long long based u64: -#ifdef __powerpc64__ -# include <asm-generic/int-l64.h> -#else -# include <asm-generic/int-ll64.h> -#endif +#include <asm-generic/int-ll64.h> This will avoid reoccuring spurious warnings in core kernel code that comes when people test on their own hardware. (i.e. x86 in ~98% of the cases) This is what x86 uses and it generally helps keep 64-bit code 32-bit clean too. [Adjusted to not impact user mode (from paulus) - sfr] Signed-off-by: Ingo Molnar <[email protected]> Signed-off-by: Stephen Rothwell <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
1 parent 66c721e commit fe33332

File tree

20 files changed

+70
-66
lines changed

20 files changed

+70
-66
lines changed

‎arch/powerpc/include/asm/rtas.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919

2020
#define RTAS_UNKNOWN_SERVICE (-1)
21-
#define RTAS_INSTANTIATE_MAX (1UL<<30) /* Don't instantiate rtas at/above this value */
21+
#define RTAS_INSTANTIATE_MAX (1ULL<<30) /* Don't instantiate rtas at/above this value */
2222

2323
/* Buffer size for ppc_rtas system call. */
2424
#define RTAS_RMOBUF_MAX (64 * 1024)

‎arch/powerpc/include/asm/types.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
#ifndef _ASM_POWERPC_TYPES_H
22
#define _ASM_POWERPC_TYPES_H
33

4-
#ifdef __powerpc64__
4+
/*
5+
* This is here because we used to use l64 for 64bit powerpc
6+
* and we don't want to impact user mode with our change to ll64
7+
* in the kernel.
8+
*/
9+
#if defined(__powerpc64__) && !defined(__KERNEL__)
510
# include <asm-generic/int-l64.h>
611
#else
712
# include <asm-generic/int-ll64.h>

‎arch/powerpc/kernel/dma-iommu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ static int dma_iommu_dma_supported(struct device *dev, u64 mask)
7979
"Warning: IOMMU offset too big for device mask\n");
8080
if (tbl)
8181
printk(KERN_INFO
82-
"mask: 0x%08lx, table offset: 0x%08lx\n",
82+
"mask: 0x%08llx, table offset: 0x%08lx\n",
8383
mask, tbl->it_offset);
8484
else
85-
printk(KERN_INFO "mask: 0x%08lx, table unavailable\n",
85+
printk(KERN_INFO "mask: 0x%08llx, table unavailable\n",
8686
mask);
8787
return 0;
8888
} else

‎arch/powerpc/kernel/iommu.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -239,12 +239,12 @@ static void __iommu_free(struct iommu_table *tbl, dma_addr_t dma_addr,
239239
if (printk_ratelimit()) {
240240
printk(KERN_INFO "iommu_free: invalid entry\n");
241241
printk(KERN_INFO "\tentry = 0x%lx\n", entry);
242-
printk(KERN_INFO "\tdma_addr = 0x%lx\n", (u64)dma_addr);
243-
printk(KERN_INFO "\tTable = 0x%lx\n", (u64)tbl);
244-
printk(KERN_INFO "\tbus# = 0x%lx\n", (u64)tbl->it_busno);
245-
printk(KERN_INFO "\tsize = 0x%lx\n", (u64)tbl->it_size);
246-
printk(KERN_INFO "\tstartOff = 0x%lx\n", (u64)tbl->it_offset);
247-
printk(KERN_INFO "\tindex = 0x%lx\n", (u64)tbl->it_index);
242+
printk(KERN_INFO "\tdma_addr = 0x%llx\n", (u64)dma_addr);
243+
printk(KERN_INFO "\tTable = 0x%llx\n", (u64)tbl);
244+
printk(KERN_INFO "\tbus# = 0x%llx\n", (u64)tbl->it_busno);
245+
printk(KERN_INFO "\tsize = 0x%llx\n", (u64)tbl->it_size);
246+
printk(KERN_INFO "\tstartOff = 0x%llx\n", (u64)tbl->it_offset);
247+
printk(KERN_INFO "\tindex = 0x%llx\n", (u64)tbl->it_index);
248248
WARN_ON(1);
249249
}
250250
return;

‎arch/powerpc/kernel/lparcfg.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ static void parse_ppp_data(struct seq_file *m)
240240
if (rc)
241241
return;
242242

243-
seq_printf(m, "partition_entitled_capacity=%ld\n",
243+
seq_printf(m, "partition_entitled_capacity=%lld\n",
244244
ppp_data.entitlement);
245245
seq_printf(m, "group=%d\n", ppp_data.group_num);
246246
seq_printf(m, "system_active_processors=%d\n",
@@ -265,7 +265,7 @@ static void parse_ppp_data(struct seq_file *m)
265265
ppp_data.unallocated_weight);
266266
seq_printf(m, "capacity_weight=%d\n", ppp_data.weight);
267267
seq_printf(m, "capped=%d\n", ppp_data.capped);
268-
seq_printf(m, "unallocated_capacity=%ld\n",
268+
seq_printf(m, "unallocated_capacity=%lld\n",
269269
ppp_data.unallocated_entitlement);
270270
}
271271

@@ -509,10 +509,10 @@ static ssize_t update_ppp(u64 *entitlement, u8 *weight)
509509
} else
510510
return -EINVAL;
511511

512-
pr_debug("%s: current_entitled = %lu, current_weight = %u\n",
512+
pr_debug("%s: current_entitled = %llu, current_weight = %u\n",
513513
__func__, ppp_data.entitlement, ppp_data.weight);
514514

515-
pr_debug("%s: new_entitled = %lu, new_weight = %u\n",
515+
pr_debug("%s: new_entitled = %llu, new_weight = %u\n",
516516
__func__, new_entitled, new_weight);
517517

518518
retval = plpar_hcall_norets(H_SET_PPP, new_entitled, new_weight);
@@ -558,7 +558,7 @@ static ssize_t update_mpp(u64 *entitlement, u8 *weight)
558558
pr_debug("%s: current_entitled = %lu, current_weight = %u\n",
559559
__func__, mpp_data.entitled_mem, mpp_data.mem_weight);
560560

561-
pr_debug("%s: new_entitled = %lu, new_weight = %u\n",
561+
pr_debug("%s: new_entitled = %llu, new_weight = %u\n",
562562
__func__, new_entitled, new_weight);
563563

564564
rc = plpar_hcall_norets(H_SET_MPP, new_entitled, new_weight);

‎arch/powerpc/kernel/setup_64.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -434,8 +434,8 @@ void __init setup_system(void)
434434
printk("Starting Linux PPC64 %s\n", init_utsname()->version);
435435

436436
printk("-----------------------------------------------------\n");
437-
printk("ppc64_pft_size = 0x%lx\n", ppc64_pft_size);
438-
printk("physicalMemorySize = 0x%lx\n", lmb_phys_mem_size());
437+
printk("ppc64_pft_size = 0x%llx\n", ppc64_pft_size);
438+
printk("physicalMemorySize = 0x%llx\n", lmb_phys_mem_size());
439439
if (ppc64_caches.dline_size != 0x80)
440440
printk("ppc64_caches.dcache_line_size = 0x%x\n",
441441
ppc64_caches.dline_size);
@@ -493,7 +493,7 @@ static void __init emergency_stack_init(void)
493493
* bringup, we need to get at them in real mode. This means they
494494
* must also be within the RMO region.
495495
*/
496-
limit = min(0x10000000UL, lmb.rmo_size);
496+
limit = min(0x10000000ULL, lmb.rmo_size);
497497

498498
for_each_possible_cpu(i) {
499499
unsigned long sp;

‎arch/powerpc/mm/stab.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,8 @@ void __init stabs_alloc(void)
251251

252252
paca[cpu].stab_addr = newstab;
253253
paca[cpu].stab_real = virt_to_abs(newstab);
254-
printk(KERN_INFO "Segment table for CPU %d at 0x%lx "
255-
"virtual, 0x%lx absolute\n",
254+
printk(KERN_INFO "Segment table for CPU %d at 0x%llx "
255+
"virtual, 0x%llx absolute\n",
256256
cpu, paca[cpu].stab_addr, paca[cpu].stab_real);
257257
}
258258
}

‎arch/powerpc/oprofile/op_model_pa6t.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ static int pa6t_reg_setup(struct op_counter_config *ctr,
132132
for (pmc = 0; pmc < cur_cpu_spec->num_pmcs; pmc++) {
133133
/* counters are 40 bit. Move to cputable at some point? */
134134
reset_value[pmc] = (0x1UL << 39) - ctr[pmc].count;
135-
pr_debug("reset_value for pmc%u inited to 0x%lx\n",
135+
pr_debug("reset_value for pmc%u inited to 0x%llx\n",
136136
pmc, reset_value[pmc]);
137137
}
138138

@@ -177,7 +177,7 @@ static int pa6t_start(struct op_counter_config *ctr)
177177

178178
oprofile_running = 1;
179179

180-
pr_debug("start on cpu %d, mmcr0 %lx\n", smp_processor_id(), mmcr0);
180+
pr_debug("start on cpu %d, mmcr0 %llx\n", smp_processor_id(), mmcr0);
181181

182182
return 0;
183183
}
@@ -193,7 +193,7 @@ static void pa6t_stop(void)
193193

194194
oprofile_running = 0;
195195

196-
pr_debug("stop on cpu %d, mmcr0 %lx\n", smp_processor_id(), mmcr0);
196+
pr_debug("stop on cpu %d, mmcr0 %llx\n", smp_processor_id(), mmcr0);
197197
}
198198

199199
/* handle the perfmon overflow vector */

‎arch/powerpc/platforms/cell/beat_interrupt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ static void beatic_end_irq(unsigned int irq_plug)
9999
err = beat_downcount_of_interrupt(irq_plug);
100100
if (err != 0) {
101101
if ((err & 0xFFFFFFFF) != 0xFFFFFFF5) /* -11: wrong state */
102-
panic("Failed to downcount IRQ! Error = %16lx", err);
102+
panic("Failed to downcount IRQ! Error = %16llx", err);
103103

104104
printk(KERN_ERR "IRQ over-downcounted, plug %d\n", irq_plug);
105105
}

‎arch/powerpc/platforms/cell/celleb_scc_epci.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,15 +405,15 @@ static int __init celleb_setup_epci(struct device_node *node,
405405
hose->cfg_addr = ioremap(r.start, (r.end - r.start + 1));
406406
if (!hose->cfg_addr)
407407
goto error;
408-
pr_debug("EPCI: cfg_addr map 0x%016lx->0x%016lx + 0x%016lx\n",
408+
pr_debug("EPCI: cfg_addr map 0x%016llx->0x%016lx + 0x%016llx\n",
409409
r.start, (unsigned long)hose->cfg_addr, (r.end - r.start + 1));
410410

411411
if (of_address_to_resource(node, 2, &r))
412412
goto error;
413413
hose->cfg_data = ioremap(r.start, (r.end - r.start + 1));
414414
if (!hose->cfg_data)
415415
goto error;
416-
pr_debug("EPCI: cfg_data map 0x%016lx->0x%016lx + 0x%016lx\n",
416+
pr_debug("EPCI: cfg_data map 0x%016llx->0x%016lx + 0x%016llx\n",
417417
r.start, (unsigned long)hose->cfg_data, (r.end - r.start + 1));
418418

419419
hose->ops = &celleb_epci_ops;

‎arch/powerpc/platforms/cell/iommu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ static int __init cell_iommu_init_disabled(void)
855855
*/
856856
if (np && size < lmb_end_of_DRAM()) {
857857
printk(KERN_WARNING "iommu: force-enabled, dma window"
858-
" (%ldMB) smaller than total memory (%ldMB)\n",
858+
" (%ldMB) smaller than total memory (%lldMB)\n",
859859
size >> 20, lmb_end_of_DRAM() >> 20);
860860
return -ENODEV;
861861
}
@@ -985,7 +985,7 @@ static void cell_dma_dev_setup_fixed(struct device *dev)
985985
addr = cell_iommu_get_fixed_address(dev) + dma_iommu_fixed_base;
986986
archdata->dma_data = (void *)addr;
987987

988-
dev_dbg(dev, "iommu: fixed addr = %lx\n", addr);
988+
dev_dbg(dev, "iommu: fixed addr = %llx\n", addr);
989989
}
990990

991991
static void insert_16M_pte(unsigned long addr, unsigned long *ptab,

‎arch/powerpc/platforms/cell/ras.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@ static void dump_fir(int cpu)
3838
/* Todo: do some nicer parsing of bits and based on them go down
3939
* to other sub-units FIRs and not only IIC
4040
*/
41-
printk(KERN_ERR "Global Checkstop FIR : 0x%016lx\n",
41+
printk(KERN_ERR "Global Checkstop FIR : 0x%016llx\n",
4242
in_be64(&pregs->checkstop_fir));
43-
printk(KERN_ERR "Global Recoverable FIR : 0x%016lx\n",
43+
printk(KERN_ERR "Global Recoverable FIR : 0x%016llx\n",
4444
in_be64(&pregs->checkstop_fir));
45-
printk(KERN_ERR "Global MachineCheck FIR : 0x%016lx\n",
45+
printk(KERN_ERR "Global MachineCheck FIR : 0x%016llx\n",
4646
in_be64(&pregs->spec_att_mchk_fir));
4747

4848
if (iregs == NULL)
4949
return;
50-
printk(KERN_ERR "IOC FIR : 0x%016lx\n",
50+
printk(KERN_ERR "IOC FIR : 0x%016llx\n",
5151
in_be64(&iregs->ioc_fir));
5252

5353
}

‎arch/powerpc/platforms/cell/spu_base.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ static inline void spu_load_slb(struct spu *spu, int slbe, struct spu_slb *slb)
151151
{
152152
struct spu_priv2 __iomem *priv2 = spu->priv2;
153153

154-
pr_debug("%s: adding SLB[%d] 0x%016lx 0x%016lx\n",
154+
pr_debug("%s: adding SLB[%d] 0x%016llx 0x%016llx\n",
155155
__func__, slbe, slb->vsid, slb->esid);
156156

157157
out_be64(&priv2->slb_index_W, slbe);
@@ -221,7 +221,7 @@ static int __spu_trap_data_map(struct spu *spu, unsigned long ea, u64 dsisr)
221221
{
222222
int ret;
223223

224-
pr_debug("%s, %lx, %lx\n", __func__, dsisr, ea);
224+
pr_debug("%s, %llx, %lx\n", __func__, dsisr, ea);
225225

226226
/*
227227
* Handle kernel space hash faults immediately. User hash

‎arch/powerpc/platforms/cell/spu_callbacks.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ long spu_sys_callback(struct spu_syscall_block *s)
5454
long (*syscall)(u64 a1, u64 a2, u64 a3, u64 a4, u64 a5, u64 a6);
5555

5656
if (s->nr_ret >= ARRAY_SIZE(spu_syscall_table)) {
57-
pr_debug("%s: invalid syscall #%ld", __func__, s->nr_ret);
57+
pr_debug("%s: invalid syscall #%lld", __func__, s->nr_ret);
5858
return -ENOSYS;
5959
}
6060

‎arch/powerpc/platforms/iseries/iommu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ static int tce_build_iSeries(struct iommu_table *tbl, long index, long npages,
6666

6767
rc = HvCallXm_setTce((u64)tbl->it_index, (u64)index, tce);
6868
if (rc)
69-
panic("PCI_DMA: HvCallXm_setTce failed, Rc: 0x%lx\n",
69+
panic("PCI_DMA: HvCallXm_setTce failed, Rc: 0x%llx\n",
7070
rc);
7171
index++;
7272
uaddr += TCE_PAGE_SIZE;
@@ -81,7 +81,7 @@ static void tce_free_iSeries(struct iommu_table *tbl, long index, long npages)
8181
while (npages--) {
8282
rc = HvCallXm_setTce((u64)tbl->it_index, (u64)index, 0);
8383
if (rc)
84-
panic("PCI_DMA: HvCallXm_setTce failed, Rc: 0x%lx\n",
84+
panic("PCI_DMA: HvCallXm_setTce failed, Rc: 0x%llx\n",
8585
rc);
8686
index++;
8787
}

‎arch/powerpc/platforms/pseries/iommu.c

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ static int tce_build_pSeriesLP(struct iommu_table *tbl, long tcenum,
127127
}
128128

129129
if (rc && printk_ratelimit()) {
130-
printk("tce_build_pSeriesLP: plpar_tce_put failed. rc=%ld\n", rc);
131-
printk("\tindex = 0x%lx\n", (u64)tbl->it_index);
132-
printk("\ttcenum = 0x%lx\n", (u64)tcenum);
133-
printk("\ttce val = 0x%lx\n", tce );
130+
printk("tce_build_pSeriesLP: plpar_tce_put failed. rc=%lld\n", rc);
131+
printk("\tindex = 0x%llx\n", (u64)tbl->it_index);
132+
printk("\ttcenum = 0x%llx\n", (u64)tcenum);
133+
printk("\ttce val = 0x%llx\n", tce );
134134
show_stack(current, (unsigned long *)__get_SP());
135135
}
136136

@@ -210,10 +210,10 @@ static int tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum,
210210
}
211211

212212
if (rc && printk_ratelimit()) {
213-
printk("tce_buildmulti_pSeriesLP: plpar_tce_put failed. rc=%ld\n", rc);
214-
printk("\tindex = 0x%lx\n", (u64)tbl->it_index);
215-
printk("\tnpages = 0x%lx\n", (u64)npages);
216-
printk("\ttce[0] val = 0x%lx\n", tcep[0]);
213+
printk("tce_buildmulti_pSeriesLP: plpar_tce_put failed. rc=%lld\n", rc);
214+
printk("\tindex = 0x%llx\n", (u64)tbl->it_index);
215+
printk("\tnpages = 0x%llx\n", (u64)npages);
216+
printk("\ttce[0] val = 0x%llx\n", tcep[0]);
217217
show_stack(current, (unsigned long *)__get_SP());
218218
}
219219
return ret;
@@ -227,9 +227,9 @@ static void tce_free_pSeriesLP(struct iommu_table *tbl, long tcenum, long npages
227227
rc = plpar_tce_put((u64)tbl->it_index, (u64)tcenum << 12, 0);
228228

229229
if (rc && printk_ratelimit()) {
230-
printk("tce_free_pSeriesLP: plpar_tce_put failed. rc=%ld\n", rc);
231-
printk("\tindex = 0x%lx\n", (u64)tbl->it_index);
232-
printk("\ttcenum = 0x%lx\n", (u64)tcenum);
230+
printk("tce_free_pSeriesLP: plpar_tce_put failed. rc=%lld\n", rc);
231+
printk("\tindex = 0x%llx\n", (u64)tbl->it_index);
232+
printk("\ttcenum = 0x%llx\n", (u64)tcenum);
233233
show_stack(current, (unsigned long *)__get_SP());
234234
}
235235

@@ -246,9 +246,9 @@ static void tce_freemulti_pSeriesLP(struct iommu_table *tbl, long tcenum, long n
246246

247247
if (rc && printk_ratelimit()) {
248248
printk("tce_freemulti_pSeriesLP: plpar_tce_stuff failed\n");
249-
printk("\trc = %ld\n", rc);
250-
printk("\tindex = 0x%lx\n", (u64)tbl->it_index);
251-
printk("\tnpages = 0x%lx\n", (u64)npages);
249+
printk("\trc = %lld\n", rc);
250+
printk("\tindex = 0x%llx\n", (u64)tbl->it_index);
251+
printk("\tnpages = 0x%llx\n", (u64)npages);
252252
show_stack(current, (unsigned long *)__get_SP());
253253
}
254254
}
@@ -261,10 +261,9 @@ static unsigned long tce_get_pSeriesLP(struct iommu_table *tbl, long tcenum)
261261
rc = plpar_tce_get((u64)tbl->it_index, (u64)tcenum << 12, &tce_ret);
262262

263263
if (rc && printk_ratelimit()) {
264-
printk("tce_get_pSeriesLP: plpar_tce_get failed. rc=%ld\n",
265-
rc);
266-
printk("\tindex = 0x%lx\n", (u64)tbl->it_index);
267-
printk("\ttcenum = 0x%lx\n", (u64)tcenum);
264+
printk("tce_get_pSeriesLP: plpar_tce_get failed. rc=%lld\n", rc);
265+
printk("\tindex = 0x%llx\n", (u64)tbl->it_index);
266+
printk("\ttcenum = 0x%llx\n", (u64)tcenum);
268267
show_stack(current, (unsigned long *)__get_SP());
269268
}
270269

‎arch/powerpc/sysdev/mpic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ static void __init mpic_scan_ht_msi(struct mpic *mpic, u8 __iomem *devbase,
435435
addr = addr | ((u64)readl(base + HT_MSI_ADDR_HI) << 32);
436436
}
437437

438-
printk(KERN_DEBUG "mpic: - HT:%02x.%x %s MSI mapping found @ 0x%lx\n",
438+
printk(KERN_DEBUG "mpic: - HT:%02x.%x %s MSI mapping found @ 0x%llx\n",
439439
PCI_SLOT(devfn), PCI_FUNC(devfn),
440440
flags & HT_MSI_FLAGS_ENABLE ? "enabled" : "disabled", addr);
441441

‎drivers/net/pasemi_mac.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ static inline void pasemi_mac_rx_error(const struct pasemi_mac *mac,
712712
rcmdsta = read_dma_reg(PAS_DMA_RXINT_RCMDSTA(mac->dma_if));
713713
ccmdsta = read_dma_reg(PAS_DMA_RXCHAN_CCMDSTA(chan->chno));
714714

715-
printk(KERN_ERR "pasemi_mac: rx error. macrx %016lx, rx status %lx\n",
715+
printk(KERN_ERR "pasemi_mac: rx error. macrx %016llx, rx status %llx\n",
716716
macrx, *chan->status);
717717

718718
printk(KERN_ERR "pasemi_mac: rcmdsta %08x ccmdsta %08x\n",
@@ -730,8 +730,8 @@ static inline void pasemi_mac_tx_error(const struct pasemi_mac *mac,
730730

731731
cmdsta = read_dma_reg(PAS_DMA_TXCHAN_TCMDSTA(chan->chno));
732732

733-
printk(KERN_ERR "pasemi_mac: tx error. mactx 0x%016lx, "\
734-
"tx status 0x%016lx\n", mactx, *chan->status);
733+
printk(KERN_ERR "pasemi_mac: tx error. mactx 0x%016llx, "\
734+
"tx status 0x%016llx\n", mactx, *chan->status);
735735

736736
printk(KERN_ERR "pasemi_mac: tcmdsta 0x%08x\n", cmdsta);
737737
}

‎drivers/pcmcia/electra_cf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ static int __devinit electra_cf_probe(struct of_device *ofdev,
297297
goto fail3;
298298
}
299299

300-
dev_info(device, "at mem 0x%lx io 0x%lx irq %d\n",
300+
dev_info(device, "at mem 0x%lx io 0x%llx irq %d\n",
301301
cf->mem_phys, io.start, cf->irq);
302302

303303
cf->active = 1;

0 commit comments

Comments
 (0)