Skip to content

Commit ee5f791

Browse files
ionutnechitaionutnechita
committed
SUNLIGHT: Stable 12/10/2023 - KERNEL.ORG
Description: - Stable 12/10/2023 - KERNEL.ORG Change-Id: I07bf07ef119f09054f0494bdd1e28a5b7167a535 Signed-off-by: Ionut Nechita <ionut_n2001@yahoo.com>
2 parents 26d69b9 + 3318612 commit ee5f791

File tree

153 files changed

+1332
-623
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+1332
-623
lines changed

‎Documentation/ABI/testing/sysfs-class-led

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,6 @@ Description:
5959
brightness. Reading this file when no hw brightness change
6060
event has happened will return an ENODATA error.
6161

62-
What: /sys/class/leds/<led>/color
63-
Date: June 2023
64-
KernelVersion: 6.5
65-
Description:
66-
Color of the LED.
67-
68-
This is a read-only file. Reading this file returns the color
69-
of the LED as a string (e.g: "red", "green", "multicolor").
70-
7162
What: /sys/class/leds/<led>/trigger
7263
Date: March 2006
7364
KernelVersion: 2.6.17

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 6
4-
SUBLEVEL = 4
4+
SUBLEVEL = 5
55
EXTRAVERSION =
66
NAME = Hurr durr I'ma ninja sloth
77

‎arch/parisc/include/asm/alternative.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end,
3434

3535
/* Alternative SMP implementation. */
3636
#define ALTERNATIVE(cond, replacement) "!0:" \
37-
".section .altinstructions, \"aw\" !" \
37+
".section .altinstructions, \"a\" !" \
38+
".align 4 !" \
3839
".word (0b-4-.) !" \
3940
".hword 1, " __stringify(cond) " !" \
4041
".word " __stringify(replacement) " !" \
@@ -44,15 +45,17 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end,
4445

4546
/* to replace one single instructions by a new instruction */
4647
#define ALTERNATIVE(from, to, cond, replacement)\
47-
.section .altinstructions, "aw" ! \
48+
.section .altinstructions, "a" ! \
49+
.align 4 ! \
4850
.word (from - .) ! \
4951
.hword (to - from)/4, cond ! \
5052
.word replacement ! \
5153
.previous
5254

5355
/* to replace multiple instructions by new code */
5456
#define ALTERNATIVE_CODE(from, num_instructions, cond, new_instr_ptr)\
55-
.section .altinstructions, "aw" ! \
57+
.section .altinstructions, "a" ! \
58+
.align 4 ! \
5659
.word (from - .) ! \
5760
.hword -num_instructions, cond ! \
5861
.word (new_instr_ptr - .) ! \

‎arch/parisc/include/asm/assembly.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,7 @@
574574
*/
575575
#define ASM_EXCEPTIONTABLE_ENTRY(fault_addr, except_addr) \
576576
.section __ex_table,"aw" ! \
577+
.align 4 ! \
577578
.word (fault_addr - .), (except_addr - .) ! \
578579
.previous
579580

‎arch/parisc/include/asm/bug.h

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,15 @@
2828
do { \
2929
asm volatile("\n" \
3030
"1:\t" PARISC_BUG_BREAK_ASM "\n" \
31-
"\t.pushsection __bug_table,\"aw\"\n" \
31+
"\t.pushsection __bug_table,\"a\"\n" \
32+
"\t.align %4\n" \
3233
"2:\t" ASM_WORD_INSN "1b, %c0\n" \
33-
"\t.short %c1, %c2\n" \
34-
"\t.org 2b+%c3\n" \
34+
"\t.short %1, %2\n" \
35+
"\t.blockz %3-2*%4-2*2\n" \
3536
"\t.popsection" \
3637
: : "i" (__FILE__), "i" (__LINE__), \
37-
"i" (0), "i" (sizeof(struct bug_entry)) ); \
38+
"i" (0), "i" (sizeof(struct bug_entry)), \
39+
"i" (sizeof(long)) ); \
3840
unreachable(); \
3941
} while(0)
4042

@@ -51,27 +53,31 @@
5153
do { \
5254
asm volatile("\n" \
5355
"1:\t" PARISC_BUG_BREAK_ASM "\n" \
54-
"\t.pushsection __bug_table,\"aw\"\n" \
56+
"\t.pushsection __bug_table,\"a\"\n" \
57+
"\t.align %4\n" \
5558
"2:\t" ASM_WORD_INSN "1b, %c0\n" \
56-
"\t.short %c1, %c2\n" \
57-
"\t.org 2b+%c3\n" \
59+
"\t.short %1, %2\n" \
60+
"\t.blockz %3-2*%4-2*2\n" \
5861
"\t.popsection" \
5962
: : "i" (__FILE__), "i" (__LINE__), \
6063
"i" (BUGFLAG_WARNING|(flags)), \
61-
"i" (sizeof(struct bug_entry)) ); \
64+
"i" (sizeof(struct bug_entry)), \
65+
"i" (sizeof(long)) ); \
6266
} while(0)
6367
#else
6468
#define __WARN_FLAGS(flags) \
6569
do { \
6670
asm volatile("\n" \
6771
"1:\t" PARISC_BUG_BREAK_ASM "\n" \
68-
"\t.pushsection __bug_table,\"aw\"\n" \
72+
"\t.pushsection __bug_table,\"a\"\n" \
73+
"\t.align %2\n" \
6974
"2:\t" ASM_WORD_INSN "1b\n" \
70-
"\t.short %c0\n" \
71-
"\t.org 2b+%c1\n" \
75+
"\t.short %0\n" \
76+
"\t.blockz %1-%2-2\n" \
7277
"\t.popsection" \
7378
: : "i" (BUGFLAG_WARNING|(flags)), \
74-
"i" (sizeof(struct bug_entry)) ); \
79+
"i" (sizeof(struct bug_entry)), \
80+
"i" (sizeof(long)) ); \
7581
} while(0)
7682
#endif
7783

‎arch/parisc/include/asm/jump_label.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool bran
1515
asm_volatile_goto("1:\n\t"
1616
"nop\n\t"
1717
".pushsection __jump_table, \"aw\"\n\t"
18+
".align %1\n\t"
1819
".word 1b - ., %l[l_yes] - .\n\t"
1920
__stringify(ASM_ULONG_INSN) " %c0 - .\n\t"
2021
".popsection\n\t"
21-
: : "i" (&((char *)key)[branch]) : : l_yes);
22+
: : "i" (&((char *)key)[branch]), "i" (sizeof(long))
23+
: : l_yes);
2224

2325
return false;
2426
l_yes:
@@ -30,10 +32,12 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, bool
3032
asm_volatile_goto("1:\n\t"
3133
"b,n %l[l_yes]\n\t"
3234
".pushsection __jump_table, \"aw\"\n\t"
35+
".align %1\n\t"
3336
".word 1b - ., %l[l_yes] - .\n\t"
3437
__stringify(ASM_ULONG_INSN) " %c0 - .\n\t"
3538
".popsection\n\t"
36-
: : "i" (&((char *)key)[branch]) : : l_yes);
39+
: : "i" (&((char *)key)[branch]), "i" (sizeof(long))
40+
: : l_yes);
3741

3842
return false;
3943
l_yes:

‎arch/parisc/include/asm/ldcw.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
})
5656

5757
#ifdef CONFIG_SMP
58-
# define __lock_aligned __section(".data..lock_aligned")
58+
# define __lock_aligned __section(".data..lock_aligned") __aligned(16)
5959
#endif
6060

6161
#endif /* __PARISC_LDCW_H */

‎arch/parisc/include/asm/uaccess.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ struct exception_table_entry {
4141

4242
#define ASM_EXCEPTIONTABLE_ENTRY( fault_addr, except_addr )\
4343
".section __ex_table,\"aw\"\n" \
44+
".align 4\n" \
4445
".word (" #fault_addr " - .), (" #except_addr " - .)\n\t" \
4546
".previous\n"
4647

‎arch/parisc/include/uapi/asm/errno.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575

7676
/* We now return you to your regularly scheduled HPUX. */
7777

78-
#define ENOSYM 215 /* symbol does not exist in executable */
7978
#define ENOTSOCK 216 /* Socket operation on non-socket */
8079
#define EDESTADDRREQ 217 /* Destination address required */
8180
#define EMSGSIZE 218 /* Message too long */
@@ -101,7 +100,6 @@
101100
#define ETIMEDOUT 238 /* Connection timed out */
102101
#define ECONNREFUSED 239 /* Connection refused */
103102
#define EREFUSED ECONNREFUSED /* for HP's NFS apparently */
104-
#define EREMOTERELEASE 240 /* Remote peer released connection */
105103
#define EHOSTDOWN 241 /* Host is down */
106104
#define EHOSTUNREACH 242 /* No route to host */
107105

‎arch/parisc/kernel/vmlinux.lds.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ SECTIONS
130130
RO_DATA(8)
131131

132132
/* unwind info */
133+
. = ALIGN(4);
133134
.PARISC.unwind : {
134135
__start___unwind = .;
135136
*(.PARISC.unwind)

0 commit comments

Comments
 (0)