Skip to content

Commit ac77510

Browse files
maddy-kerneldevmaddy-kerneldev
committed
Automatic merge of 'next-test' into merge-test (2025-11-14 11:15)
2 parents 88ca349 + fb2ff9f commit ac77510

32 files changed

+161
-73
lines changed

‎Documentation/admin-guide/kernel-parameters.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1013,7 +1013,7 @@
10131013
It will be ignored when crashkernel=X,high is not used
10141014
or memory reserved is below 4G.
10151015
crashkernel=size[KMG],cma
1016-
[KNL, X86] Reserve additional crash kernel memory from
1016+
[KNL, X86, ppc] Reserve additional crash kernel memory from
10171017
CMA. This reservation is usable by the first system's
10181018
userspace memory and kernel movable allocations (memory
10191019
balloon, zswap). Pages allocated from this memory range

‎arch/powerpc/boot/addnote.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ static int e_class = ELFCLASS32;
6868
#define PUT_16BE(off, v)(buf[off] = ((v) >> 8) & 0xff, \
6969
buf[(off) + 1] = (v) & 0xff)
7070
#define PUT_32BE(off, v)(PUT_16BE((off), (v) >> 16L), PUT_16BE((off) + 2, (v)))
71-
#define PUT_64BE(off, v)((PUT_32BE((off), (v) >> 32L), \
72-
PUT_32BE((off) + 4, (v))))
71+
#define PUT_64BE(off, v)((PUT_32BE((off), (unsigned long long)(v) >> 32L), \
72+
PUT_32BE((off) + 4, (unsigned long long)(v))))
7373

7474
#define GET_16LE(off) ((buf[off]) + (buf[(off)+1] << 8))
7575
#define GET_32LE(off) (GET_16LE(off) + (GET_16LE((off)+2U) << 16U))
@@ -78,7 +78,8 @@ static int e_class = ELFCLASS32;
7878
#define PUT_16LE(off, v) (buf[off] = (v) & 0xff, \
7979
buf[(off) + 1] = ((v) >> 8) & 0xff)
8080
#define PUT_32LE(off, v) (PUT_16LE((off), (v)), PUT_16LE((off) + 2, (v) >> 16L))
81-
#define PUT_64LE(off, v) (PUT_32LE((off), (v)), PUT_32LE((off) + 4, (v) >> 32L))
81+
#define PUT_64LE(off, v) (PUT_32LE((off), (unsigned long long)(v)), \
82+
PUT_32LE((off) + 4, (unsigned long long)(v) >> 32L))
8283

8384
#define GET_16(off) (e_data == ELFDATA2MSB ? GET_16BE(off) : GET_16LE(off))
8485
#define GET_32(off) (e_data == ELFDATA2MSB ? GET_32BE(off) : GET_32LE(off))

‎arch/powerpc/boot/dts/asp834x-redboot.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
reg = <0xff000000 0x00000200>;
7373
bus-frequency = <0>;
7474

75-
wdt@200 {
75+
watchdog@200 {
7676
device_type = "watchdog";
7777
compatible = "mpc83xx_wdt";
7878
reg = <0x200 0x100>;

‎arch/powerpc/boot/dts/fsl/ge_imp3a.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
gpio-controller;
9595
};
9696

97-
wdt@4,800 {
97+
watchdog@4,800 {
9898
compatible = "ge,imp3a-fpga-wdt", "gef,fpga-wdt-1.00",
9999
"gef,fpga-wdt";
100100
reg = <0x4 0x800 0x8>;
@@ -103,7 +103,7 @@
103103
};
104104

105105
/* Second watchdog available, driver currently supports one.
106-
wdt@4,808 {
106+
watchdog@4,808 {
107107
compatible = "gef,imp3a-fpga-wdt", "gef,fpga-wdt-1.00",
108108
"gef,fpga-wdt";
109109
reg = <0x4 0x808 0x8>;

‎arch/powerpc/boot/dts/fsl/gef_ppc9a.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,15 @@
8282
reg = <0x4 0x0 0x40>;
8383
};
8484

85-
wdt@4,2000 {
85+
watchdog@4,2000 {
8686
compatible = "gef,ppc9a-fpga-wdt", "gef,fpga-wdt-1.00",
8787
"gef,fpga-wdt";
8888
reg = <0x4 0x2000 0x8>;
8989
interrupts = <0x1a 0x4>;
9090
interrupt-parent = <&gef_pic>;
9191
};
9292
/* Second watchdog available, driver currently supports one.
93-
wdt@4,2010 {
93+
watchdog@4,2010 {
9494
compatible = "gef,ppc9a-fpga-wdt", "gef,fpga-wdt-1.00",
9595
"gef,fpga-wdt";
9696
reg = <0x4 0x2010 0x8>;

‎arch/powerpc/boot/dts/fsl/gef_sbc310.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@
7979
reg = <0x4 0x0 0x40>;
8080
};
8181

82-
wdt@4,2000 {
82+
watchdog@4,2000 {
8383
compatible = "gef,sbc310-fpga-wdt", "gef,fpga-wdt-1.00",
8484
"gef,fpga-wdt";
8585
reg = <0x4 0x2000 0x8>;
8686
interrupts = <0x1a 0x4>;
8787
interrupt-parent = <&gef_pic>;
8888
};
8989
/*
90-
wdt@4,2010 {
90+
watchdog@4,2010 {
9191
compatible = "gef,sbc310-fpga-wdt", "gef,fpga-wdt-1.00",
9292
"gef,fpga-wdt";
9393
reg = <0x4 0x2010 0x8>;

‎arch/powerpc/boot/dts/fsl/gef_sbc610.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,14 @@
8282
reg = <0x4 0x0 0x40>;
8383
};
8484

85-
wdt@4,2000 {
85+
watchdog@4,2000 {
8686
compatible = "gef,fpga-wdt";
8787
reg = <0x4 0x2000 0x8>;
8888
interrupts = <0x1a 0x4>;
8989
interrupt-parent = <&gef_pic>;
9090
};
9191
/* Second watchdog available, driver currently supports one.
92-
wdt@4,2010 {
92+
watchdog@4,2010 {
9393
compatible = "gef,fpga-wdt";
9494
reg = <0x4 0x2010 0x8>;
9595
interrupts = <0x1b 0x4>;

‎arch/powerpc/boot/dts/mpc5121.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
};
113113

114114
/* Watchdog timer */
115-
wdt@900 {
115+
watchdog@900 {
116116
compatible = "fsl,mpc5121-wdt";
117117
reg = <0x900 0x100>;
118118
};

‎arch/powerpc/boot/dts/mpc8313erdb.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
reg = <0xe0000000 0x00000200>;
100100
bus-frequency = <0>;
101101

102-
wdt@200 {
102+
watchdog@200 {
103103
device_type = "watchdog";
104104
compatible = "mpc83xx_wdt";
105105
reg = <0x200 0x100>;

‎arch/powerpc/boot/dts/mpc8315erdb.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
reg = <0xe0000000 0x00000200>;
101101
bus-frequency = <0>;
102102

103-
wdt@200 {
103+
watchdog@200 {
104104
device_type = "watchdog";
105105
compatible = "mpc83xx_wdt";
106106
reg = <0x200 0x100>;

0 commit comments

Comments
 (0)