diff options
Diffstat (limited to 'recipes-kernel/linux/linux-hierofalcon/412-styx-Fix-build-issues-after-porting-PCI-patches-to-4.1.2-.patch')
-rw-r--r-- | recipes-kernel/linux/linux-hierofalcon/412-styx-Fix-build-issues-after-porting-PCI-patches-to-4.1.2-.patch | 107 |
1 files changed, 107 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-hierofalcon/412-styx-Fix-build-issues-after-porting-PCI-patches-to-4.1.2-.patch b/recipes-kernel/linux/linux-hierofalcon/412-styx-Fix-build-issues-after-porting-PCI-patches-to-4.1.2-.patch new file mode 100644 index 0000000..91054a7 --- /dev/null +++ b/recipes-kernel/linux/linux-hierofalcon/412-styx-Fix-build-issues-after-porting-PCI-patches-to-4.1.2-.patch | |||
@@ -0,0 +1,107 @@ | |||
1 | From 8471812e8eee4a56562885cb5746d42587c5074a Mon Sep 17 00:00:00 2001 | ||
2 | From: Adrian Calianu <adrian.calianu@enea.com> | ||
3 | Date: Thu, 13 Aug 2015 09:28:28 +0200 | ||
4 | Subject: [PATCH] Fix build issues after porting PCI patches to 4.1.2 kernel | ||
5 | |||
6 | Signed-off-by: Adrian Calianu <adrian.calianu@enea.com> | ||
7 | --- | ||
8 | drivers/irqchip/irq-gic-v2m.c | 3 +-- | ||
9 | drivers/pci/host/pci-host-generic.c | 9 ++++----- | ||
10 | include/linux/irqchip/arm-gic.h | 2 ++ | ||
11 | include/linux/irqdomain.h | 1 - | ||
12 | include/linux/mod_devicetable.h | 1 + | ||
13 | 5 files changed, 8 insertions(+), 8 deletions(-) | ||
14 | |||
15 | diff --git a/drivers/irqchip/irq-gic-v2m.c b/drivers/irqchip/irq-gic-v2m.c | ||
16 | index c32eb55..5b219f3 100644 | ||
17 | --- a/drivers/irqchip/irq-gic-v2m.c | ||
18 | +++ b/drivers/irqchip/irq-gic-v2m.c | ||
19 | @@ -263,14 +263,13 @@ static int __init gicv2m_init_one(struct irq_domain *parent, | ||
20 | goto err_iounmap; | ||
21 | } | ||
22 | |||
23 | - inner_domain = irq_domain_add_tree(node, &gicv2m_domain_ops, v2m); | ||
24 | + inner_domain = irq_domain_add_tree(NULL, &gicv2m_domain_ops, v2m); | ||
25 | if (!inner_domain) { | ||
26 | pr_err("Failed to create GICv2m domain\n"); | ||
27 | ret = -ENOMEM; | ||
28 | goto err_free_bm; | ||
29 | } | ||
30 | |||
31 | - inner_domain->bus_token = DOMAIN_BUS_PLATFORM_MSI; | ||
32 | inner_domain->name = gicv2m_domain_name; | ||
33 | |||
34 | ret = -ENOMEM; | ||
35 | diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c | ||
36 | index 01931e8..a4780c7 100644 | ||
37 | --- a/drivers/pci/host/pci-host-generic.c | ||
38 | +++ b/drivers/pci/host/pci-host-generic.c | ||
39 | @@ -102,10 +102,9 @@ MODULE_DEVICE_TABLE(of, gen_pci_of_match); | ||
40 | |||
41 | static void gen_pci_release_of_pci_ranges(struct gen_pci *pci) | ||
42 | { | ||
43 | - struct pci_host_bridge_window *win; | ||
44 | + struct resource_entry *win; | ||
45 | |||
46 | - list_for_each_entry(win, &pci->resources, list) | ||
47 | - /* Release only requested resources */ | ||
48 | + resource_list_for_each_entry(win, &pci->resources) | ||
49 | if (win->res->parent) | ||
50 | release_resource(win->res); | ||
51 | |||
52 | @@ -231,12 +230,12 @@ struct pci_bus *gen_scan_root_bus(struct device *parent, int bus, | ||
53 | struct pci_ops *ops, void *sysdata, | ||
54 | struct list_head *resources) | ||
55 | { | ||
56 | - struct pci_host_bridge_window *window; | ||
57 | + struct resource_entry *window; | ||
58 | bool found = false; | ||
59 | struct pci_bus *b; | ||
60 | int max; | ||
61 | |||
62 | - list_for_each_entry(window, resources, list) | ||
63 | + resource_list_for_each_entry(window, resources) | ||
64 | if (window->res->flags & IORESOURCE_BUS) { | ||
65 | found = true; | ||
66 | break; | ||
67 | diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h | ||
68 | index f490f26..8eaeac1 100644 | ||
69 | --- a/include/linux/irqchip/arm-gic.h | ||
70 | +++ b/include/linux/irqchip/arm-gic.h | ||
71 | @@ -122,7 +122,9 @@ static inline void gic_init(unsigned int nr, int start, | ||
72 | |||
73 | int gicv2m_of_init(struct device_node *node, struct irq_domain *parent); | ||
74 | |||
75 | +/* | ||
76 | void gic_send_sgi(unsigned int cpu_id, unsigned int irq); | ||
77 | +*/ | ||
78 | int gic_get_cpu_id(unsigned int cpu); | ||
79 | void gic_migrate_target(unsigned int new_cpu_id); | ||
80 | unsigned long gic_get_sgir_physaddr(void); | ||
81 | diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h | ||
82 | index ddd6602..9964c3e 100644 | ||
83 | --- a/include/linux/irqdomain.h | ||
84 | +++ b/include/linux/irqdomain.h | ||
85 | @@ -120,7 +120,6 @@ struct irq_domain { | ||
86 | unsigned int flags; | ||
87 | |||
88 | /* Optional data */ | ||
89 | - struct device_node *of_node; | ||
90 | enum irq_domain_ref_type type; | ||
91 | union { | ||
92 | struct device_node *of_node; | ||
93 | diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h | ||
94 | index 8a958d1..8492ad7 100644 | ||
95 | --- a/include/linux/mod_devicetable.h | ||
96 | +++ b/include/linux/mod_devicetable.h | ||
97 | @@ -190,6 +190,7 @@ struct css_device_id { | ||
98 | struct acpi_device_id { | ||
99 | __u8 id[ACPI_ID_LEN]; | ||
100 | kernel_ulong_t driver_data; | ||
101 | + __u32 cls; | ||
102 | }; | ||
103 | |||
104 | #define PNP_ID_LEN 8 | ||
105 | -- | ||
106 | 1.9.1 | ||
107 | |||