summaryrefslogtreecommitdiffstats
path: root/meta-vib3-extras/recipes/linux/linux-nvidia/0001-Change-extern-inline-to-static-inline.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-vib3-extras/recipes/linux/linux-nvidia/0001-Change-extern-inline-to-static-inline.patch')
-rw-r--r--meta-vib3-extras/recipes/linux/linux-nvidia/0001-Change-extern-inline-to-static-inline.patch133
1 files changed, 133 insertions, 0 deletions
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia/0001-Change-extern-inline-to-static-inline.patch b/meta-vib3-extras/recipes/linux/linux-nvidia/0001-Change-extern-inline-to-static-inline.patch
new file mode 100644
index 0000000..66f031f
--- /dev/null
+++ b/meta-vib3-extras/recipes/linux/linux-nvidia/0001-Change-extern-inline-to-static-inline.patch
@@ -0,0 +1,133 @@
1From 0873625fb43dda5a54919b7414f235cdfdd98ddc Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@theqtcompany.com>
3Date: Wed, 13 Apr 2016 15:42:49 +0300
4Subject: [PATCH] Change "extern inline" to "static inline"
5
6With compilers which follow the C99 standard (like modern versions of gcc and
7clang), "extern inline" does the wrong thing (emits code for an externally
8linkable version of the inline function). "static inline" is the correct choice
9instead.
10---
11 drivers/staging/rtl8192u/ieee80211/ieee80211.h | 10 +++++-----
12 drivers/staging/rtl8712/ieee80211.h | 4 ++--
13 lib/mpi/mpi-inline.h | 2 +-
14 lib/mpi/mpi-internal.h | 16 ++++++++--------
15 4 files changed, 16 insertions(+), 16 deletions(-)
16
17diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
18index 502bfdb..1c8d026 100644
19--- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
20+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
21@@ -2254,7 +2254,7 @@ static inline void *ieee80211_priv(struct net_device *dev)
22 return ((struct ieee80211_device *)netdev_priv(dev))->priv;
23 }
24
25-extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
26+static inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
27 {
28 /* Single white space is for Linksys APs */
29 if (essid_len == 1 && essid[0] == ' ')
30@@ -2270,7 +2270,7 @@ extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
31 return 1;
32 }
33
34-extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode)
35+static inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode)
36 {
37 /*
38 * It is possible for both access points and our device to support
39@@ -2296,7 +2296,7 @@ extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mod
40 return 0;
41 }
42
43-extern inline int ieee80211_get_hdrlen(u16 fc)
44+static inline int ieee80211_get_hdrlen(u16 fc)
45 {
46 int hdrlen = IEEE80211_3ADDR_LEN;
47
48@@ -2582,12 +2582,12 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee);
49
50 extern const long ieee80211_wlan_frequencies[];
51
52-extern inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
53+static inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
54 {
55 ieee->scans++;
56 }
57
58-extern inline int ieee80211_get_scans(struct ieee80211_device *ieee)
59+static inline int ieee80211_get_scans(struct ieee80211_device *ieee)
60 {
61 return ieee->scans;
62 }
63diff --git a/drivers/staging/rtl8712/ieee80211.h b/drivers/staging/rtl8712/ieee80211.h
64index 21515c3..7518061 100644
65--- a/drivers/staging/rtl8712/ieee80211.h
66+++ b/drivers/staging/rtl8712/ieee80211.h
67@@ -734,7 +734,7 @@ enum ieee80211_state {
68 #define IEEE_G (1<<2)
69 #define IEEE_MODE_MASK (IEEE_A|IEEE_B|IEEE_G)
70
71-extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
72+static inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
73 {
74 /* Single white space is for Linksys APs */
75 if (essid_len == 1 && essid[0] == ' ')
76@@ -748,7 +748,7 @@ extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
77 return 1;
78 }
79
80-extern inline int ieee80211_get_hdrlen(u16 fc)
81+static inline int ieee80211_get_hdrlen(u16 fc)
82 {
83 int hdrlen = 24;
84
85diff --git a/lib/mpi/mpi-inline.h b/lib/mpi/mpi-inline.h
86index e2b3985..c245ea3 100644
87--- a/lib/mpi/mpi-inline.h
88+++ b/lib/mpi/mpi-inline.h
89@@ -30,7 +30,7 @@
90 #define G10_MPI_INLINE_H
91
92 #ifndef G10_MPI_INLINE_DECL
93-#define G10_MPI_INLINE_DECL extern inline
94+#define G10_MPI_INLINE_DECL static inline
95 #endif
96
97 G10_MPI_INLINE_DECL mpi_limb_t
98diff --git a/lib/mpi/mpi-internal.h b/lib/mpi/mpi-internal.h
99index 77adcf6..4566d11 100644
100--- a/lib/mpi/mpi-internal.h
101+++ b/lib/mpi/mpi-internal.h
102@@ -172,20 +172,20 @@ void mpi_rshift_limbs(MPI a, unsigned int count);
103 int mpi_lshift_limbs(MPI a, unsigned int count);
104
105 /*-- mpihelp-add.c --*/
106-mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
107- mpi_size_t s1_size, mpi_limb_t s2_limb);
108+//mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
109+// mpi_size_t s1_size, mpi_limb_t s2_limb);
110 mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
111 mpi_ptr_t s2_ptr, mpi_size_t size);
112-mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
113- mpi_ptr_t s2_ptr, mpi_size_t s2_size);
114+//mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
115+// mpi_ptr_t s2_ptr, mpi_size_t s2_size);
116
117 /*-- mpihelp-sub.c --*/
118-mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
119- mpi_size_t s1_size, mpi_limb_t s2_limb);
120+//mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
121+// mpi_size_t s1_size, mpi_limb_t s2_limb);
122 mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
123 mpi_ptr_t s2_ptr, mpi_size_t size);
124-mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
125- mpi_ptr_t s2_ptr, mpi_size_t s2_size);
126+//mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
127+// mpi_ptr_t s2_ptr, mpi_size_t s2_size);
128
129 /*-- mpihelp-cmp.c --*/
130 int mpihelp_cmp(mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size);
131--
1321.9.1
133