Pull linus#master to merge PER_CPU_DEF_ATTRIBUTES and alpha build fix changes. As alpha in percpu tree uses 'weak' attribute instead of inline assembly, there's no need for __used attribute.
Showing the changes to scripts (3 of 1365 files). Show all
Unified · Split
| @@ -0,0 +1,5 @@ | ||
| 1 | +dtc | |
| 2 | +dtc-lexer.lex.c | |
| 3 | +dtc-parser.tab.c | |
| 4 | +dtc-parser.tab.h | |
| 5 | + | |
| @@ -1426,6 +1426,8 @@ sub dump_struct($$) { · 1425 unmodified lines | ||
| 1426 | 1426 | # strip comments: |
| 1427 | 1427 | $members =~ s/\/\*.*?\*\///gos; |
| 1428 | 1428 | $nested =~ s/\/\*.*?\*\///gos; |
| 1429 | + # strip kmemcheck_bitfield_{begin,end}.*; | |
| 1430 | + $members =~ s/kmemcheck_bitfield_.*?;//gos; | |
| 1429 | 1431 | |
| 1430 | 1432 | create_parameterlist($members, ';', $file); |
| 1431 | 1433 | check_sections($file, $declaration_name, "struct", $sectcheck, $struct_actual, $nested); |
| @@ -1468,8 +1470,6 @@ sub dump_enum($$) { · 36 unmodified lines | ||
| 1468 | 1470 | } |
| 1469 | 1471 | |
| 1470 | 1472 | } |
| 1471 | − # strip kmemcheck_bitfield_{begin,end}.*; | |
| 1472 | − $members =~ s/kmemcheck_bitfield_.*?;//gos; | |
| 1473 | 1473 | |
| 1474 | 1474 | output_declaration($declaration_name, |
| 1475 | 1475 | 'enum', |
| @@ -237,7 +237,7 @@ static void write_header(void) · 236 unmodified lines | ||
| 237 | 237 | fprintf(out, " * Linux logo %s\n", logoname); |
| 238 | 238 | fputs(" */\n\n", out); |
| 239 | 239 | fputs("#include <linux/linux_logo.h>\n\n", out); |
| 240 | − fprintf(out, "static const unsigned char %s_data[] __initconst = {\n", | |
| 240 | + fprintf(out, "static unsigned char %s_data[] __initdata = {\n", | |
| 241 | 241 | logoname); |
| 242 | 242 | } |
| 243 | 243 | |
| @@ -374,7 +374,7 @@ static void write_logo_clut224(void) · 130 unmodified lines | ||
| 374 | 374 | fputs("\n};\n\n", out); |
| 375 | 375 | |
| 376 | 376 | /* write logo clut */ |
| 377 | − fprintf(out, "static const unsigned char %s_clut[] __initconst = {\n", | |
| 377 | + fprintf(out, "static unsigned char %s_clut[] __initdata = {\n", | |
| 378 | 378 | logoname); |
| 379 | 379 | write_hex_cnt = 0; |
| 380 | 380 | for (i = 0; i < logo_clutsize; i++) { |