Skip to content

Commit e7262e6

Browse files
committed
Linux Kernel 3.10.12 compiles and runs (.rej cleaned up)
Applied: /LineageOS/android/kernel/sony/msm8994$ patch -p1 -R < /home/dj/Downloads/linuxkernelpatches/patch-3.10.12-13 Leaving out revert: 1) arch/arm64/kernel/perf_event.c - due to discrepancy Change-Id: I89e8c7c099c45b50b9cc6958c01d79db5f245e6a --- arch/arm64/kernel/perf_event.c +++ arch/arm64/kernel/perf_event.c @@ -781,7 +778,7 @@ static const unsigned armv8_pmuv3_perf_cache_map[PERF_COUNT_HW_CACHE_MAX] /* * PMXEVTYPER: Event selection reg */ -#define ARMV8_EVTYPE_MASK 0xc80000ff /* Mask for writable bits */ +#define ARMV8_EVTYPE_MASK 0xc00000ff /* Mask for writable bits */ /* * PMXEVTYPER: Event selection reg */ writable bits */ 2) drivers/mtd/ubi/wl.c - just memory freeing, therefore leaving out 3) drivers/usb/dwc3/gadget.c - due to discrepancy 4) drivers/usb/host/xhci.c - all reverts encapsulated with #ifndef CONFIG_USB_DEFAULT_PERSIST 5) driver/usb/host/xhci.h - #define removal not necessary 6) fs/fuse/fuse_i.h - commented out instead of removing
1 parent ea8a00d commit e7262e6

File tree

122 files changed

+504
-974
lines changed

Some content is hidden

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

122 files changed

+504
-974
lines changed

Documentation/DocBook/media_api.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
2-
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
3-
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
2+
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
3+
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
44
<!ENTITY % media-entities SYSTEM "./media-entities.tmpl"> %media-entities;
55
<!ENTITY media-indices SYSTEM "./media-indices.tmpl">
66

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION = 3
22
PATCHLEVEL = 10
3-
SUBLEVEL = 13
3+
SUBLEVEL = 12
44
EXTRAVERSION =
55
NAME = TOSSUG Baby Fish
66

arch/arm/boot/dts/at91rm9200.dtsi

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,8 @@
3535
ssc2 = &ssc2;
3636
};
3737
cpus {
38-
#address-cells = <0>;
39-
#size-cells = <0>;
40-
41-
cpu {
38+
cpu@0 {
4239
compatible = "arm,arm920t";
43-
device_type = "cpu";
4440
};
4541
};
4642

arch/arm/boot/dts/at91sam9260.dtsi

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,8 @@
3232
ssc0 = &ssc0;
3333
};
3434
cpus {
35-
#address-cells = <0>;
36-
#size-cells = <0>;
37-
38-
cpu {
39-
compatible = "arm,arm926ej-s";
40-
device_type = "cpu";
35+
cpu@0 {
36+
compatible = "arm,arm926ejs";
4137
};
4238
};
4339

arch/arm/boot/dts/at91sam9263.dtsi

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,8 @@
2929
ssc1 = &ssc1;
3030
};
3131
cpus {
32-
#address-cells = <0>;
33-
#size-cells = <0>;
34-
35-
cpu {
36-
compatible = "arm,arm926ej-s";
37-
device_type = "cpu";
32+
cpu@0 {
33+
compatible = "arm,arm926ejs";
3834
};
3935
};
4036

arch/arm/boot/dts/at91sam9g45.dtsi

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,8 @@
3535
ssc1 = &ssc1;
3636
};
3737
cpus {
38-
#address-cells = <0>;
39-
#size-cells = <0>;
40-
41-
cpu {
42-
compatible = "arm,arm926ej-s";
43-
device_type = "cpu";
38+
cpu@0 {
39+
compatible = "arm,arm926ejs";
4440
};
4541
};
4642

arch/arm/boot/dts/at91sam9n12.dtsi

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,8 @@
3131
ssc0 = &ssc0;
3232
};
3333
cpus {
34-
#address-cells = <0>;
35-
#size-cells = <0>;
36-
37-
cpu {
38-
compatible = "arm,arm926ej-s";
39-
device_type = "cpu";
34+
cpu@0 {
35+
compatible = "arm,arm926ejs";
4036
};
4137
};
4238

arch/arm/boot/dts/at91sam9x5.dtsi

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,8 @@
3333
ssc0 = &ssc0;
3434
};
3535
cpus {
36-
#address-cells = <0>;
37-
#size-cells = <0>;
38-
39-
cpu {
40-
compatible = "arm,arm926ej-s";
41-
device_type = "cpu";
36+
cpu@0 {
37+
compatible = "arm,arm926ejs";
4238
};
4339
};
4440

arch/arm/boot/dts/sama5d3.dtsi

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,8 @@
3535
ssc1 = &ssc1;
3636
};
3737
cpus {
38-
#address-cells = <1>;
39-
#size-cells = <0>;
4038
cpu@0 {
41-
device_type = "cpu";
4239
compatible = "arm,cortex-a5";
43-
reg = <0x0>;
4440
};
4541
};
4642

arch/arm/boot/dts/sun4i-a10.dtsi

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,8 @@
1616
interrupt-parent = <&intc>;
1717

1818
cpus {
19-
#address-cells = <1>;
20-
#size-cells = <0>;
2119
cpu@0 {
22-
device_type = "cpu";
2320
compatible = "arm,cortex-a8";
24-
reg = <0x0>;
2521
};
2622
};
2723

0 commit comments

Comments
 (0)