Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-28 16:52:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git

Browse Source
This commit is contained in:
Stephen Rothwell 2024-12-20 10:41:45 +11:00
commit 2c3bb86ef6
4 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/include/asm/time.h
View File

@ -86,7 +86,7 @@ static inline unsigned long tb_ticks_since(unsigned long tstamp)
#define mulhdu(x,y) \
({unsigned long z; asm ("mulhdu %0,%1,%2" : "=r" (z) : "r" (x), "r" (y)); z;})
#else
extern u64 mulhdu(u64, u64);
#define mulhdu(x, y) mul_u64_u64_shr(x, y, 64)
#endif
extern void div128_by_32(u64 dividend_high, u64 dividend_low,

26
arch/powerpc/kernel/misc_32.S
View File

@ -27,32 +27,6 @@
.text
/*
* This returns the high 64 bits of the product of two 64-bit numbers.
*/
_GLOBAL(mulhdu)
cmpwi r6,0
cmpwi cr1,r3,0
mr r10,r4
mulhwu r4,r4,r5
beq 1f
mulhwu r0,r10,r6
mullw r7,r10,r5
addc r7,r0,r7
addze r4,r4
1: beqlr cr1 /* all done if high part of A is 0 */
mullw r9,r3,r5
mulhwu r10,r3,r5
beq 2f
mullw r0,r3,r6
mulhwu r8,r3,r6
addc r7,r0,r7
adde r4,r4,r8
addze r10,r10
2: addc r4,r4,r9
addze r3,r10
blr
/*
* reloc_got2 runs through the .got2 section adding an offset
* to each entry.

6
arch/powerpc/xmon/xmon.c
View File

@ -2623,9 +2623,9 @@ static void dump_one_paca(int cpu)
printf("paca for cpu 0x%x @ %px:\n", cpu, p);
printf(" %-*s = %s\n", 25, "possible", cpu_possible(cpu) ? "yes" : "no");
printf(" %-*s = %s\n", 25, "present", cpu_present(cpu) ? "yes" : "no");
printf(" %-*s = %s\n", 25, "online", cpu_online(cpu) ? "yes" : "no");
printf(" %-*s = %s\n", 25, "possible", str_yes_no(cpu_possible(cpu)));
printf(" %-*s = %s\n", 25, "present", str_yes_no(cpu_present(cpu)));
printf(" %-*s = %s\n", 25, "online", str_yes_no(cpu_online(cpu)));
#define DUMP(paca, name, format) \
printf(" %-*s = "format"\t(0x%lx)\n", 25, #name, 18, paca->name, \

2
tools/testing/selftests/powerpc/vphn/test-vphn.c
View File

@ -275,7 +275,7 @@ static struct test {
}
},
{
/* Parse a 32-bit value split accross two consecutives 64-bit
/* Parse a 32-bit value split across two consecutives 64-bit
* input values.
*/
"vphn: 16-bit value followed by 2 x 32-bit values",