diff options
| author | Markus Pargmann <mpa@pengutronix.de> | 2015-11-11 08:08:20 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-12-09 20:36:59 +0100 |
| commit | ce9214c6b01ed1115385fd6d1b61097007df95aa (patch) | |
| tree | a1256cb979fcad7d59a93b8b66df0452ae85ae5d /patches | |
| parent | 4146c12f76e99851d4e004119c9645b79cb47479 (diff) | |
| download | ptxdist-ce9214c6b01ed1115385fd6d1b61097007df95aa.tar.gz ptxdist-ce9214c6b01ed1115385fd6d1b61097007df95aa.tar.xz | |
NBD: Update to 3.12.1
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
[mol: add upstream patch to fix building on PPC]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/nbd-3.12.1/0001-Don-t-make-the-readit-function-depend-on-WORDS_BIGEN.patch | 31 | ||||
| -rw-r--r-- | patches/nbd-3.12.1/series | 4 |
2 files changed, 35 insertions, 0 deletions
diff --git a/patches/nbd-3.12.1/0001-Don-t-make-the-readit-function-depend-on-WORDS_BIGEN.patch b/patches/nbd-3.12.1/0001-Don-t-make-the-readit-function-depend-on-WORDS_BIGEN.patch new file mode 100644 index 000000000..c84172966 --- /dev/null +++ b/patches/nbd-3.12.1/0001-Don-t-make-the-readit-function-depend-on-WORDS_BIGEN.patch @@ -0,0 +1,31 @@ +From: Wouter Verhelst <w@uter.be> +Date: Tue, 1 Dec 2015 13:59:27 +0100 +Subject: [PATCH] Don't make the readit() function depend on WORDS_BIGENDIAN + +We had accidentally moved the readit() function to the wrong location in +this cliserv file, which meant that it wouldn't be compiled in if +WORDS_BIGENDIAN was defined. + +Fix that. +--- + cliserv.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/cliserv.c b/cliserv.c +index 93835f9800af..241aa556ed26 100644 +--- a/cliserv.c ++++ b/cliserv.c +@@ -81,6 +81,7 @@ u64 ntohll(u64 a) { + hi = ntohl(hi); + return ((u64) lo) << 32U | hi; + } ++#endif + + /** + * Read data from a file descriptor into a buffer +@@ -103,5 +104,3 @@ void readit(int f, void *buf, size_t len) { + } + } + } +- +-#endif diff --git a/patches/nbd-3.12.1/series b/patches/nbd-3.12.1/series new file mode 100644 index 000000000..21ea7d41f --- /dev/null +++ b/patches/nbd-3.12.1/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Don-t-make-the-readit-function-depend-on-WORDS_BIGEN.patch +# e21d14a8cba5e1ec12aea4ded98639ae - git-ptx-patches magic |