diff options
| author | Benjamin Herrenschmidt | 2014-05-05 12:33:10 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt | 2014-05-05 12:57:12 +0200 |
| commit | f6869e7fe657bd977e72954cd78c5871a6a4f71d (patch) | |
| tree | 1e34a4bb36cde4b541d7344599e65b541bb4bee7 /arch/powerpc/boot | |
| parent | powerpc/mm: use macro PGTABLE_EADDR_SIZE instead of digital (diff) | |
| parent | selftests/powerpc: Update for ABIv2 (diff) | |
| download | kernel-qcow2-linux-f6869e7fe657bd977e72954cd78c5871a6a4f71d.tar.gz kernel-qcow2-linux-f6869e7fe657bd977e72954cd78c5871a6a4f71d.tar.xz kernel-qcow2-linux-f6869e7fe657bd977e72954cd78c5871a6a4f71d.zip | |
Merge remote-tracking branch 'anton/abiv2' into next
This series adds support for building the powerpc 64-bit
LE kernel using the new ABI v2. We already supported
running ABI v2 userspace programs but this adds support
for building the kernel itself using the new ABI.
Diffstat (limited to 'arch/powerpc/boot')
| -rw-r--r-- | arch/powerpc/boot/util.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/util.S b/arch/powerpc/boot/util.S index 6636b1d7821b..243b8497d58b 100644 --- a/arch/powerpc/boot/util.S +++ b/arch/powerpc/boot/util.S @@ -45,7 +45,7 @@ udelay: mfspr r4,SPRN_PVR srwi r4,r4,16 cmpwi 0,r4,1 /* 601 ? */ - bne .udelay_not_601 + bne .Ludelay_not_601 00: li r0,86 /* Instructions / microsecond? */ mtctr r0 10: addi r0,r0,0 /* NOP */ @@ -54,7 +54,7 @@ udelay: bne 00b blr -.udelay_not_601: +.Ludelay_not_601: mulli r4,r3,1000 /* nanoseconds */ /* Change r4 to be the number of ticks using: * (nanoseconds + (timebase_period_ns - 1 )) / timebase_period_ns |