Skip to contentSkip to conversation

backports: fix compilation for 2.6.25 for math64 header

PATCH In review Luis R. Rodriguez 1 participant 4 messages Aug 27, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 backports: fix compilation for 2.6.25 for math64 header

From: "Luis R. Rodriguez" <[email protected]>

We need to ifdef correctly before assuming we can include that header.

---
 backport/backport-include/linux/math64.h |    5 +++++
 1 file changed, 5 insertions(+)
backport/backport-include/linux/math64.h +5 -0
index d551db6..b65fab3 100644
@@ -2,7 +2,12 @@
 #define _COMPAT_LINUX_MATH64_H 1
 
 #include <linux/version.h>
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25))
 #include_next <linux/math64.h>
+#else
+#include <linux/types.h>
+#include <asm/div64.h>
+#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25)) */
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
 #if BITS_PER_LONG == 64
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 2/4 backports: add generic semaphore.h

From: "Luis R. Rodriguez" <[email protected]>

Matthew generalized the semaphore implementation and part of that collateral evolution consisted of changing the header used for the expected routines from asm/semaphore.h to linux/semaphore.h.

mcgrof@garbanzo ~/linux-next (git::master)$ git describe --contains \
	64ac24e738823161693bf791f87adc802cf529ff

v2.6.26-rc1~1155^2~5

commit 64ac24e738823161693bf791f87adc802cf529ff

Author: Matthew Wilcox <[email protected]>
Date:   Fri Mar 7 21:55:58 2008 -0500

Generic semaphore implementation

Semaphores are no longer performance-critical, so a generic C implementation is better for maintainability, debuggability and extensibility. Thanks to Peter Zijlstra for fixing the lockdep warning. Thanks to Harvey Harrison for pointing out that the unlikely() was unnecessary.

---
 backport/backport-include/linux/semaphore.h |   12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 backport/backport-include/linux/semaphore.h
backport/backport-include/linux/semaphore.h new file +12 -0
new file mode 100644
index 0000000..d242df4
@@ -0,0 +1,12 @@
+#ifndef __BACKPORT_LINUX_SEMAPHORE_H
+#define __BACKPORT_LINUX_SEMAPHORE_H
+
+#include <linux/version.h>
+
+#if  LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+#include_next <linux/semaphore.h>
+#else
+#include <asm/semaphore.h>
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
+
+#endif /* __BACKPORT_LINUX_SEMAPHORE_H */
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 3/4 backports: refresh patches for next-20130802 again

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

For some reason some other changes were picked up again now.

== ckmake-report.log ==

1   2.6.25              [  OK  ]
2   2.6.26              [  OK  ]
3   2.6.27              [  OK  ]
4   2.6.28              [  OK  ]
5   2.6.29              [  OK  ]
6   2.6.30              [  OK  ]
7   2.6.31              [  OK  ]
8   2.6.32              [  OK  ]
9   2.6.33              [  OK  ]
10  2.6.34              [  OK  ]
11  2.6.35              [  OK  ]
12  2.6.36              [  OK  ]
13  2.6.37              [  OK  ]
14  2.6.38              [  OK  ]
15  2.6.39              [  OK  ]
16  3.0.79              [  OK  ]
17  3.1.10              [  OK  ]
18  3.10-rc1            [  OK  ]
19  3.2.45              [  OK  ]
20  3.3.8               [  OK  ]
21  3.4.46              [  OK  ]
22  3.5.7               [  OK  ]
23  3.6.11              [  OK  ]
24  3.7.10              [  OK  ]
25  3.8.13              [  OK  ]
26  3.9.3               [  OK  ]
real    34m47.737s
user    937m23.708s
sys     129m50.928s
---
 .../11-dev-pm-ops/drivers_net_ethernet_atheros_alx_main.patch    |    4 ++--
 .../network/16-bluetooth/net_bluetooth_hci_sysfs.patch           |    2 +-
 .../network/16-bluetooth/net_bluetooth_rfcomm_tty.patch          |    6 +++---
 .../drivers_net_ethernet_atheros_alx_main.patch                  |    2 +-
 .../network/63-tty-termios/net_bluetooth_rfcomm_tty.patch        |    2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)
patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_alx_main.patch +2 -2
index 0b32146..318cc34 100644
@@ -1,6 +1,6 @@
 --- a/drivers/net/ethernet/atheros/alx/main.c
 +++ b/drivers/net/ethernet/atheros/alx/main.c
-@@ -1403,6 +1403,9 @@ static int alx_resume(struct device *dev
+@@ -1401,6 +1401,9 @@ static int alx_resume(struct device *dev
  	return __alx_open(alx, true);
  }
  
@@ -10,7 +10,7 @@
  static SIMPLE_DEV_PM_OPS(alx_pm_ops, alx_suspend, alx_resume);
  #define ALX_PM_OPS      (&alx_pm_ops)
  #else
-@@ -1505,7 +1508,12 @@ static struct pci_driver alx_driver = {
+@@ -1503,7 +1506,12 @@ static struct pci_driver alx_driver = {
  	.probe       = alx_probe,
  	.remove      = alx_remove,
  	.err_handler = &alx_err_handlers,
patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sysfs.patch +1 -1
index b4f7b1d..e78767e 100644
@@ -12,7 +12,7 @@
  	&bt_link_group,
  	NULL
  };
-@@ -378,7 +386,11 @@ static struct attribute_group bt_host_gr
+@@ -378,7 +382,11 @@ static struct attribute_group bt_host_gr
  	.attrs = bt_host_attrs,
  };
  
patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_tty.patch +3 -3
index dac5ace..52e4945 100644
@@ -1,6 +1,6 @@
 --- a/net/bluetooth/rfcomm/tty.c
 +++ b/net/bluetooth/rfcomm/tty.c
-@@ -809,7 +817,11 @@ static int rfcomm_tty_write_room(struct
+@@ -809,7 +809,11 @@ static int rfcomm_tty_write_room(struct
  	return room;
  }
  
@@ -12,7 +12,7 @@
  {
  	BT_DBG("tty %p cmd 0x%02x", tty, cmd);
  
-@@ -1068,7 +1080,11 @@ static void rfcomm_tty_hangup(struct tty
+@@ -1068,7 +1072,11 @@ static void rfcomm_tty_hangup(struct tty
  	}
  }
  
@@ -24,7 +24,7 @@
  {
  	struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
  
-@@ -1077,7 +1093,11 @@ static int rfcomm_tty_tiocmget(struct tt
+@@ -1077,7 +1085,11 @@ static int rfcomm_tty_tiocmget(struct tt
  	return dev->modem_status;
  }
  
patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_alx_main.patch +1 -1
index dbc4d50..742ae0f 100644
@@ -44,7 +44,7 @@
  #ifdef CONFIG_NET_POLL_CONTROLLER
  	.ndo_poll_controller    = alx_poll_controller,
  #endif
-@@ -1305,7 +1319,11 @@ static int alx_probe(struct pci_dev *pde
+@@ -1303,7 +1317,11 @@ static int alx_probe(struct pci_dev *pde
  		}
  	}
  
patches/collateral-evolutions/network/63-tty-termios/net_bluetooth_rfcomm_tty.patch +1 -1
index f9a6c83..cfc21d5 100644
@@ -1,6 +1,6 @@
 --- a/net/bluetooth/rfcomm/tty.c
 +++ b/net/bluetooth/rfcomm/tty.c
-@@ -868,7 +868,11 @@ static int rfcomm_tty_ioctl(struct tty_s
+@@ -860,7 +860,11 @@ static int rfcomm_tty_ioctl(struct tty_s
  
  static void rfcomm_tty_set_termios(struct tty_struct *tty, struct ktermios *old)
  {
Signature · 1 line
1.7.10.4