diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-05-12 13:19:14 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-12 13:19:14 -0400 |
| commit | 5f013c9bc70214dcacd5fbed5a06c217d6ff9c59 (patch) | |
| tree | 34c3a633000e03bca57d0ce55d8759f86edecc03 /arch/arm/include/asm/div64.h | |
| parent | Merge branch 'cxgb4' (diff) | |
| parent | ptp: fix kconfig dependency warnings (diff) | |
| download | linux-dev-5f013c9bc70214dcacd5fbed5a06c217d6ff9c59.tar.xz linux-dev-5f013c9bc70214dcacd5fbed5a06c217d6ff9c59.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/altera/altera_sgdma.c
net/netlink/af_netlink.c
net/sched/cls_api.c
net/sched/sch_api.c
The netlink conflict dealt with moving to netlink_capable() and
netlink_ns_capable() in the 'net' tree vs. supporting 'tc' operations
in non-init namespaces. These were simple transformations from
netlink_capable to netlink_ns_capable.
The Altera driver conflict was simply code removal overlapping some
void pointer cast cleanups in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/include/asm/div64.h')
| -rw-r--r-- | arch/arm/include/asm/div64.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/div64.h b/arch/arm/include/asm/div64.h index 191ada6e4d2d..662c7bd06108 100644 --- a/arch/arm/include/asm/div64.h +++ b/arch/arm/include/asm/div64.h @@ -156,7 +156,7 @@ /* Select the best insn combination to perform the */ \ /* actual __m * __n / (__p << 64) operation. */ \ if (!__c) { \ - asm ( "umull %Q0, %R0, %1, %Q2\n\t" \ + asm ( "umull %Q0, %R0, %Q1, %Q2\n\t" \ "mov %Q0, #0" \ : "=&r" (__res) \ : "r" (__m), "r" (__n) \ |