* [PATCH 2/5] Introduce include/linux/spinlock.h
2016-01-27 15:22 [PATCH 1/5] Introduce include/linux/sched.h yegorslists
@ 2016-01-27 15:22 ` yegorslists
2016-01-27 15:22 ` [PATCH 3/5] Introduce include/linux/mutex.h yegorslists
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: yegorslists @ 2016-01-27 15:22 UTC (permalink / raw)
To: barebox
From: Yegor Yefremov <yegorslists@googlemail.com>
Move spinlock related definitions to its original place.
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
drivers/mtd/nand/denali.h | 1 +
drivers/usb/gadget/f_acm.c | 1 +
drivers/usb/musb/musb_core.h | 1 +
drivers/usb/musb/phy-am335x-control.c | 1 +
drivers/video/imx-ipu-v3/imx-ipu-v3.h | 1 +
fs/pstore/platform.c | 1 +
fs/pstore/ram.c | 1 +
fs/ubifs/ubifs.h | 1 +
include/linux/barebox-wrapper.h | 7 -------
include/linux/dcache.h | 2 ++
include/linux/fs.h | 1 +
include/linux/spinlock.h | 11 +++++++++++
include/usb/composite.h | 1 +
13 files changed, 23 insertions(+), 7 deletions(-)
create mode 100644 include/linux/spinlock.h
diff --git a/drivers/mtd/nand/denali.h b/drivers/mtd/nand/denali.h
index f5511c9..515353e 100644
--- a/drivers/mtd/nand/denali.h
+++ b/drivers/mtd/nand/denali.h
@@ -21,6 +21,7 @@
#define __DENALI_H__
#include <linux/mtd/nand.h>
+#include <linux/spinlock.h>
#define DEVICE_RESET 0x0
#define DEVICE_RESET__BANK0 0x0001
diff --git a/drivers/usb/gadget/f_acm.c b/drivers/usb/gadget/f_acm.c
index f582fcd..cba59b1 100644
--- a/drivers/usb/gadget/f_acm.c
+++ b/drivers/usb/gadget/f_acm.c
@@ -17,6 +17,7 @@
#include <common.h>
#include <usb/cdc.h>
#include <linux/err.h>
+#include <linux/spinlock.h>
#include <asm/byteorder.h>
#include <usb/composite.h>
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 46265d6..a21ddd5 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -39,6 +39,7 @@
#include <notifier.h>
#include <usb/usb.h>
#include <usb/phy.h>
+#include <linux/spinlock.h>
struct musb;
struct musb_hw_ep;
diff --git a/drivers/usb/musb/phy-am335x-control.c b/drivers/usb/musb/phy-am335x-control.c
index 214ae71..809c518 100644
--- a/drivers/usb/musb/phy-am335x-control.c
+++ b/drivers/usb/musb/phy-am335x-control.c
@@ -2,6 +2,7 @@
#include <init.h>
#include <io.h>
#include <linux/err.h>
+#include <linux/spinlock.h>
struct phy_control {
void (*phy_power)(struct phy_control *phy_ctrl, u32 id, bool on);
diff --git a/drivers/video/imx-ipu-v3/imx-ipu-v3.h b/drivers/video/imx-ipu-v3/imx-ipu-v3.h
index 783535e..8deb295 100644
--- a/drivers/video/imx-ipu-v3/imx-ipu-v3.h
+++ b/drivers/video/imx-ipu-v3/imx-ipu-v3.h
@@ -16,6 +16,7 @@
#include <fb.h>
#include <video/vpl.h>
#include <video/fourcc.h>
+#include <linux/spinlock.h>
struct ipu_soc;
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c
index dc2611f..98fd26d 100644
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
@@ -23,6 +23,7 @@
#include <linux/pstore.h>
#include <linux/string.h>
#include <linux/kernel.h>
+#include <linux/spinlock.h>
#include <malloc.h>
#include <printk.h>
#include <module.h>
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index dc31ed1..66b4975 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -29,6 +29,7 @@
#include <linux/types.h>
#include <linux/string.h>
#include <linux/log2.h>
+#include <linux/spinlock.h>
#include <malloc.h>
#include <printk.h>
#include <stdio.h>
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index a4f8523..0164551 100644
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -41,6 +41,7 @@
#include <linux/mount.h>
#include <linux/path.h>
#include <linux/sched.h>
+#include <linux/spinlock.h>
#include <linux/ctype.h>
#include <linux/math64.h>
#include <linux/rbtree.h>
diff --git a/include/linux/barebox-wrapper.h b/include/linux/barebox-wrapper.h
index 3433631..91b67e1 100644
--- a/include/linux/barebox-wrapper.h
+++ b/include/linux/barebox-wrapper.h
@@ -35,13 +35,6 @@ typedef int gfp_t;
#define MODULE_LICENSE(x)
#define MODULE_ALIAS(x)
-typedef int spinlock_t;
-#define spin_lock_init(...)
-#define spin_lock(...)
-#define spin_unlock(...)
-#define spin_lock_irqsave(lock, flags) do { flags = 0; } while (0)
-#define spin_unlock_irqrestore(lock, flags) do { flags = flags; } while (0)
-
#define mutex_init(...)
#define mutex_lock(...)
#define mutex_unlock(...)
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index ea69b68..9f33e75 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -10,6 +10,8 @@
* with heavy changes by Linus Torvalds
*/
+#include <linux/spinlock.h>
+
#define IS_ROOT(x) ((x) == (x)->d_parent)
/* The hash is always the low bits of hash_len */
diff --git a/include/linux/fs.h b/include/linux/fs.h
index e9fb881..8419ebd 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -6,6 +6,7 @@
#include <linux/time.h>
#include <linux/mount.h>
#include <linux/path.h>
+#include <linux/spinlock.h>
/* Page cache limit. The filesystems should put that into their s_maxbytes
limits, otherwise bad things can happen in VM. */
diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
new file mode 100644
index 0000000..b32114f
--- /dev/null
+++ b/include/linux/spinlock.h
@@ -0,0 +1,11 @@
+#ifndef __LINUX_SPINLOCK_H
+#define __LINUX_SPINLOCK_H
+
+typedef int spinlock_t;
+#define spin_lock_init(...)
+#define spin_lock(...)
+#define spin_unlock(...)
+#define spin_lock_irqsave(lock, flags) do { flags = 0; } while (0)
+#define spin_unlock_irqrestore(lock, flags) do { flags = flags; } while (0)
+
+#endif /* __LINUX_SPINLOCK_H */
diff --git a/include/usb/composite.h b/include/usb/composite.h
index d24454c..f30568a 100644
--- a/include/usb/composite.h
+++ b/include/usb/composite.h
@@ -38,6 +38,7 @@
#include <usb/gadget.h>
#include <linux/log2.h>
#include <linux/stringify.h>
+#include <linux/spinlock.h>
/*
* USB function drivers should return USB_GADGET_DELAYED_STATUS if they
--
2.1.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 3/5] Introduce include/linux/mutex.h
2016-01-27 15:22 [PATCH 1/5] Introduce include/linux/sched.h yegorslists
2016-01-27 15:22 ` [PATCH 2/5] Introduce include/linux/spinlock.h yegorslists
@ 2016-01-27 15:22 ` yegorslists
2016-01-27 15:22 ` [PATCH 4/5] Introduce include/linux/wait.h yegorslists
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: yegorslists @ 2016-01-27 15:22 UTC (permalink / raw)
To: barebox
From: Yegor Yefremov <yegorslists@googlemail.com>
Move mutex related defines to its original place.
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
fs/pstore/platform.c | 1 +
fs/ubifs/ubifs.h | 1 +
include/linux/barebox-wrapper.h | 5 -----
include/linux/fs.h | 1 +
include/linux/mtd/spi-nor.h | 2 ++
include/linux/mutex.h | 18 ++++++++++++++++++
6 files changed, 23 insertions(+), 5 deletions(-)
create mode 100644 include/linux/mutex.h
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c
index 98fd26d..963ecaf 100644
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
@@ -24,6 +24,7 @@
#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/spinlock.h>
+#include <linux/mutex.h>
#include <malloc.h>
#include <printk.h>
#include <module.h>
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index 0164551..d655cfa 100644
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -42,6 +42,7 @@
#include <linux/path.h>
#include <linux/sched.h>
#include <linux/spinlock.h>
+#include <linux/mutex.h>
#include <linux/ctype.h>
#include <linux/math64.h>
#include <linux/rbtree.h>
diff --git a/include/linux/barebox-wrapper.h b/include/linux/barebox-wrapper.h
index 91b67e1..49439fa 100644
--- a/include/linux/barebox-wrapper.h
+++ b/include/linux/barebox-wrapper.h
@@ -35,11 +35,6 @@ typedef int gfp_t;
#define MODULE_LICENSE(x)
#define MODULE_ALIAS(x)
-#define mutex_init(...)
-#define mutex_lock(...)
-#define mutex_unlock(...)
-struct mutex { int i; };
-
struct rw_semaphore { int i; };
#define __user
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 8419ebd..89fbaea 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -7,6 +7,7 @@
#include <linux/mount.h>
#include <linux/path.h>
#include <linux/spinlock.h>
+#include <linux/mutex.h>
/* Page cache limit. The filesystems should put that into their s_maxbytes
limits, otherwise bad things can happen in VM. */
diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h
index bd2b16d..de9ac08 100644
--- a/include/linux/mtd/spi-nor.h
+++ b/include/linux/mtd/spi-nor.h
@@ -10,6 +10,8 @@
#ifndef __LINUX_MTD_SPI_NOR_H
#define __LINUX_MTD_SPI_NOR_H
+#include <linux/mutex.h>
+
/*
* Note on opcode nomenclature: some opcodes have a format like
* SPINOR_OP_FUNCTION{4,}_x_y_z. The numbers x, y, and z stand for the number
diff --git a/include/linux/mutex.h b/include/linux/mutex.h
new file mode 100644
index 0000000..a84085c
--- /dev/null
+++ b/include/linux/mutex.h
@@ -0,0 +1,18 @@
+/*
+ * Mutexes: blocking mutual exclusion locks
+ *
+ * started by Ingo Molnar:
+ *
+ * Copyright (C) 2004, 2005, 2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com>
+ *
+ * This file contains the main data structure and API definitions.
+ */
+#ifndef __LINUX_MUTEX_H
+#define __LINUX_MUTEX_H
+
+#define mutex_init(...)
+#define mutex_lock(...)
+#define mutex_unlock(...)
+struct mutex { int i; };
+
+#endif /* __LINUX_MUTEX_H */
--
2.1.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 4/5] Introduce include/linux/wait.h
2016-01-27 15:22 [PATCH 1/5] Introduce include/linux/sched.h yegorslists
2016-01-27 15:22 ` [PATCH 2/5] Introduce include/linux/spinlock.h yegorslists
2016-01-27 15:22 ` [PATCH 3/5] Introduce include/linux/mutex.h yegorslists
@ 2016-01-27 15:22 ` yegorslists
2016-01-27 15:22 ` [PATCH 5/5] Introduce include/linux/rwsem.h yegorslists
2016-01-29 7:08 ` [PATCH 1/5] Introduce include/linux/sched.h Sascha Hauer
4 siblings, 0 replies; 6+ messages in thread
From: yegorslists @ 2016-01-27 15:22 UTC (permalink / raw)
To: barebox
From: Yegor Yefremov <yegorslists@googlemail.com>
Move Linux wait queue related definitions to its original place.
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
drivers/mtd/mtdconcat.c | 1 +
include/linux/barebox-wrapper.h | 4 ----
include/linux/fs.h | 1 +
include/linux/wait.h | 11 +++++++++++
4 files changed, 13 insertions(+), 4 deletions(-)
create mode 100644 include/linux/wait.h
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c
index 837614f..6395b2f 100644
--- a/drivers/mtd/mtdconcat.c
+++ b/drivers/mtd/mtdconcat.c
@@ -23,6 +23,7 @@
*/
#include <common.h>
#include <malloc.h>
+#include <linux/wait.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/concat.h>
diff --git a/include/linux/barebox-wrapper.h b/include/linux/barebox-wrapper.h
index 49439fa..b52f2f4 100644
--- a/include/linux/barebox-wrapper.h
+++ b/include/linux/barebox-wrapper.h
@@ -51,10 +51,6 @@ struct rw_semaphore { int i; };
#define kthread_stop(...) do { } while (0)
#define wake_up_process(...) do { } while (0)
-typedef int wait_queue_head_t;
-
-#define init_waitqueue_head(...) do { } while (0)
-
typedef int irqreturn_t;
#define IRQ_NONE 0
#define IRQ_HANDLED 0
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 89fbaea..bf0f67b 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -8,6 +8,7 @@
#include <linux/path.h>
#include <linux/spinlock.h>
#include <linux/mutex.h>
+#include <linux/wait.h>
/* Page cache limit. The filesystems should put that into their s_maxbytes
limits, otherwise bad things can happen in VM. */
diff --git a/include/linux/wait.h b/include/linux/wait.h
new file mode 100644
index 0000000..e2df887
--- /dev/null
+++ b/include/linux/wait.h
@@ -0,0 +1,11 @@
+#ifndef _LINUX_WAIT_H
+#define _LINUX_WAIT_H
+/*
+ * Linux wait queue related types and methods
+ */
+
+typedef int wait_queue_head_t;
+
+#define init_waitqueue_head(...) do { } while (0)
+
+#endif /* _LINUX_WAIT_H */
--
2.1.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 5/5] Introduce include/linux/rwsem.h
2016-01-27 15:22 [PATCH 1/5] Introduce include/linux/sched.h yegorslists
` (2 preceding siblings ...)
2016-01-27 15:22 ` [PATCH 4/5] Introduce include/linux/wait.h yegorslists
@ 2016-01-27 15:22 ` yegorslists
2016-01-29 7:08 ` [PATCH 1/5] Introduce include/linux/sched.h Sascha Hauer
4 siblings, 0 replies; 6+ messages in thread
From: yegorslists @ 2016-01-27 15:22 UTC (permalink / raw)
To: barebox
From: Yegor Yefremov <yegorslists@googlemail.com>
Move semaphore related definitions to its original place.
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
include/linux/barebox-wrapper.h | 8 --------
include/linux/fs.h | 2 +-
include/linux/rwsem.h | 19 +++++++++++++++++++
3 files changed, 20 insertions(+), 9 deletions(-)
create mode 100644 include/linux/rwsem.h
diff --git a/include/linux/barebox-wrapper.h b/include/linux/barebox-wrapper.h
index b52f2f4..15fd726 100644
--- a/include/linux/barebox-wrapper.h
+++ b/include/linux/barebox-wrapper.h
@@ -35,18 +35,10 @@ typedef int gfp_t;
#define MODULE_LICENSE(x)
#define MODULE_ALIAS(x)
-struct rw_semaphore { int i; };
-
#define __user
#define __init
#define __exit
-#define init_rwsem(...) do { } while (0)
-#define down_read(...) do { } while (0)
-#define down_write(...) do { } while (0)
-#define down_write_trylock(...) 1
-#define up_read(...) do { } while (0)
-#define up_write(...) do { } while (0)
#define kthread_create(...) __builtin_return_address(0)
#define kthread_stop(...) do { } while (0)
#define wake_up_process(...) do { } while (0)
diff --git a/include/linux/fs.h b/include/linux/fs.h
index bf0f67b..7e9886a 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1,7 +1,6 @@
#ifndef _LINUX_FS_H
#define _LINUX_FS_H
-#include <linux/barebox-wrapper.h>
#include <linux/list.h>
#include <linux/time.h>
#include <linux/mount.h>
@@ -9,6 +8,7 @@
#include <linux/spinlock.h>
#include <linux/mutex.h>
#include <linux/wait.h>
+#include <linux/rwsem.h>
/* Page cache limit. The filesystems should put that into their s_maxbytes
limits, otherwise bad things can happen in VM. */
diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h
new file mode 100644
index 0000000..5259957
--- /dev/null
+++ b/include/linux/rwsem.h
@@ -0,0 +1,19 @@
+/* rwsem.h: R/W semaphores, public interface
+ *
+ * Written by David Howells (dhowells@redhat.com).
+ * Derived from asm-i386/semaphore.h
+ */
+
+#ifndef _LINUX_RWSEM_H
+#define _LINUX_RWSEM_H
+
+struct rw_semaphore { int i; };
+
+#define init_rwsem(...) do { } while (0)
+#define down_read(...) do { } while (0)
+#define down_write(...) do { } while (0)
+#define down_write_trylock(...) 1
+#define up_read(...) do { } while (0)
+#define up_write(...) do { } while (0)
+
+#endif /* _LINUX_RWSEM_H */
--
2.1.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/5] Introduce include/linux/sched.h
2016-01-27 15:22 [PATCH 1/5] Introduce include/linux/sched.h yegorslists
` (3 preceding siblings ...)
2016-01-27 15:22 ` [PATCH 5/5] Introduce include/linux/rwsem.h yegorslists
@ 2016-01-29 7:08 ` Sascha Hauer
4 siblings, 0 replies; 6+ messages in thread
From: Sascha Hauer @ 2016-01-29 7:08 UTC (permalink / raw)
To: yegorslists; +Cc: barebox
On Wed, Jan 27, 2016 at 04:22:54PM +0100, yegorslists@googlemail.com wrote:
> From: Yegor Yefremov <yegorslists@googlemail.com>
>
> Move cond_resched() from barebox-wrapper.h to its original
> place.
>
> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
> ---
> fs/ubifs/ubifs.h | 1 +
> include/linux/barebox-wrapper.h | 2 --
> include/linux/sched.h | 6 ++++++
> 3 files changed, 7 insertions(+), 2 deletions(-)
> create mode 100644 include/linux/sched.h
Applied, thanks
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread