m68k/amiga: Chip RAM - Use tabs for indentation

Gitweb:     http://git.kernel.org/linus/5be3246306e613055505f4950411f5497d97edb0
Commit:     5be3246306e613055505f4950411f5497d97edb0
Parent:     02f8c6aee8df3cdc935e9bdd4f2d020306035dbe
Author:     Geert Uytterhoeven <geert <at> linux-m68k.org>
AuthorDate: Sat May 21 20:46:39 2011 +0200
Committer:  Geert Uytterhoeven <geert <at> linux-m68k.org>
CommitDate: Sat Jul 30 21:21:37 2011 +0200

    m68k/amiga: Chip RAM - Use tabs for indentation

    Signed-off-by: Geert Uytterhoeven <geert <at> linux-m68k.org>
---
 arch/m68k/amiga/chipram.c |  118 +++++++++++++++++++++++----------------------
 1 files changed, 61 insertions(+), 57 deletions(-)

diff --git a/arch/m68k/amiga/chipram.c b/arch/m68k/amiga/chipram.c
index dd0447d..e757fff 100644
--- a/arch/m68k/amiga/chipram.c
+++ b/arch/m68k/amiga/chipram.c
@@ -23,101 +23,105 @@ unsigned long amiga_chip_size;
 EXPORT_SYMBOL(amiga_chip_size);

 static struct resource chipram_res = {
-    .name = "Chip RAM", .start = CHIP_PHYSADDR
+	.name = "Chip RAM", .start = CHIP_PHYSADDR
 };
 static unsigned long chipavail;

 
 void __init amiga_chip_init(void)
(Continue reading)

m68k/amiga: Chip RAM - Convert from printk() to pr_*()

Gitweb:     http://git.kernel.org/linus/b4f6f45302a9440e26f71dab0b95906bcc3bd13a
Commit:     b4f6f45302a9440e26f71dab0b95906bcc3bd13a
Parent:     5be3246306e613055505f4950411f5497d97edb0
Author:     Geert Uytterhoeven <geert <at> linux-m68k.org>
AuthorDate: Sun Apr 24 22:55:20 2011 +0200
Committer:  Geert Uytterhoeven <geert <at> linux-m68k.org>
CommitDate: Sat Jul 30 21:21:38 2011 +0200

    m68k/amiga: Chip RAM - Convert from printk() to pr_*()

    and fix a few formattings:
      - resource sizes are now resource_size_t, use %pR to make it future proof,
      - use %lu for unsigned long.

    Signed-off-by: Geert Uytterhoeven <geert <at> linux-m68k.org>
---
 arch/m68k/amiga/chipram.c |   28 ++++++++--------------------
 1 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/arch/m68k/amiga/chipram.c b/arch/m68k/amiga/chipram.c
index e757fff..9005fa0 100644
--- a/arch/m68k/amiga/chipram.c
+++ b/arch/m68k/amiga/chipram.c
@@ -47,9 +47,7 @@ void *amiga_chip_alloc(unsigned long size, const char *name)
 	/* round up */
 	size = PAGE_ALIGN(size);

-#ifdef DEBUG
-	printk("amiga_chip_alloc: allocate %ld bytes\n", size);
-#endif
(Continue reading)

sparc: _sparc_find_resource() should check for exact matches

Gitweb:     http://git.kernel.org/linus/88efd0bbc0fe403a9948e6f94cc48b9f15ee4861
Commit:     88efd0bbc0fe403a9948e6f94cc48b9f15ee4861
Parent:     1dad6c7bd7dd158ef874f7382615cedc21a1f48d
Author:     Geert Uytterhoeven <geert <at> linux-m68k.org>
AuthorDate: Sat May 7 15:08:36 2011 +0200
Committer:  Geert Uytterhoeven <geert <at> linux-m68k.org>
CommitDate: Sat Jul 30 21:21:38 2011 +0200

    sparc: _sparc_find_resource() should check for exact matches

    The address that's passed to _sparc_find_resource() should always be the
    start address of a resource:
      - iounmap() passes a page-aligned virtual address, while the original
        address was created by adding the in-page offset to the resource's
        start address,
      - sbus_free_coherent() and pci32_free_coherent() should be passed an
        address obtained from sbus_alloc_coherent() resp. pci32_alloc_coherent(),
        which is always a resource's start address.

    Hence replace the range check by a check for an exact match.

    Signed-off-by: Geert Uytterhoeven <geert <at> linux-m68k.org>
    Acked-by: David S. Miller <davem <at> davemloft.net>
---
 arch/sparc/kernel/ioport.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
index 1c9c80a..b5e83be 100644
--- a/arch/sparc/kernel/ioport.c
(Continue reading)

m68k/amiga: Chip RAM - Use resource_size() to fix off-by-one error

Gitweb:     http://git.kernel.org/linus/cb4f9988f86746fff3183d31381deb2b2a421a3a
Commit:     cb4f9988f86746fff3183d31381deb2b2a421a3a
Parent:     cab49bc95d848a85d7108f896f6d21283f25f54c
Author:     Geert Uytterhoeven <geert <at> linux-m68k.org>
AuthorDate: Wed Apr 27 10:28:19 2011 +0200
Committer:  Geert Uytterhoeven <geert <at> linux-m68k.org>
CommitDate: Sat Jul 30 21:21:38 2011 +0200

    m68k/amiga: Chip RAM - Use resource_size() to fix off-by-one error

    Signed-off-by: Geert Uytterhoeven <geert <at> linux-m68k.org>
---
 arch/m68k/amiga/chipram.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/m68k/amiga/chipram.c b/arch/m68k/amiga/chipram.c
index c3fe451..cfd3b7a 100644
--- a/arch/m68k/amiga/chipram.c
+++ b/arch/m68k/amiga/chipram.c
@@ -100,7 +100,7 @@ void amiga_chip_free(void *ptr)
 		if (res->start != start)
 			continue;
 		*p = res->sibling;
-		size = res->end-start;
+		size = resource_size(res);
 		pr_debug("amiga_chip_free: free %lu bytes at %p\n", size, ptr);
 		atomic_add(size, &chipavail);
 		kfree(res);
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
(Continue reading)

resources: Add lookup_resource()

Gitweb:     http://git.kernel.org/linus/1c388919d89ca35741e9c4d3255adf87f76f0c06
Commit:     1c388919d89ca35741e9c4d3255adf87f76f0c06
Parent:     88efd0bbc0fe403a9948e6f94cc48b9f15ee4861
Author:     Geert Uytterhoeven <geert <at> linux-m68k.org>
AuthorDate: Sat May 7 20:53:16 2011 +0200
Committer:  Geert Uytterhoeven <geert <at> linux-m68k.org>
CommitDate: Sat Jul 30 21:21:39 2011 +0200

    resources: Add lookup_resource()

    Add a function to find an existing resource by a resource start address.
    This allows to implement simple allocators (with a malloc/free-alike API)
    on top of the resource system.

    Signed-off-by: Geert Uytterhoeven <geert <at> linux-m68k.org>
---
 include/linux/ioport.h |    1 +
 kernel/resource.c      |   21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index e9bb22c..63eb429 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -132,6 +132,7 @@ extern int allocate_resource(struct resource *root, struct resource *new,
 						       resource_size_t,
 						       resource_size_t),
 			     void *alignf_data);
+struct resource *lookup_resource(struct resource *root, resource_size_t start);
 int adjust_resource(struct resource *res, resource_size_t start,
(Continue reading)

NFS: Re-enable compilation of nfs with !CONFIG_NFS_V4 || !CONFIG_NFS_V4_1

Gitweb:     http://git.kernel.org/linus/a00ed25cce6fe856388f89c7cd40da0eee7666a6
Commit:     a00ed25cce6fe856388f89c7cd40da0eee7666a6
Parent:     24c3047095fa3954f114bfff2e37b8fcbb216396
Author:     Trond Myklebust <Trond.Myklebust <at> netapp.com>
AuthorDate: Sun Jul 31 16:39:04 2011 -0400
Committer:  Linus Torvalds <torvalds <at> linux-foundation.org>
CommitDate: Sun Jul 31 14:27:04 2011 -1000

    NFS: Re-enable compilation of nfs with !CONFIG_NFS_V4 || !CONFIG_NFS_V4_1

    Fix two recently introduced compile problems:

    Fix a typo in fs/nfs/pnfs.h

    Move the pnfs_blksize declaration outside the CONFIG_NFS_V4 section in
    struct nfs_server.

    Reported-by: Jens Axboe <jaxboe <at> fusionio.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust <at> netapp.com>
    Signed-off-by: Linus Torvalds <torvalds <at> linux-foundation.org>
---
 fs/nfs/pnfs.h             |    2 +-
 include/linux/nfs_fs_sb.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index e0b5d80..01cbfd5 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -380,7 +380,7 @@ pnfs_roc_drain(struct inode *ino, u32 *barrier)
(Continue reading)

m68k/amiga: Chip RAM - Offset resource end by CHIP_PHYSADDR

Gitweb:     http://git.kernel.org/linus/1dad6c7bd7dd158ef874f7382615cedc21a1f48d
Commit:     1dad6c7bd7dd158ef874f7382615cedc21a1f48d
Parent:     cb4f9988f86746fff3183d31381deb2b2a421a3a
Author:     Geert Uytterhoeven <geert <at> linux-m68k.org>
AuthorDate: Sun May 22 11:09:02 2011 +0200
Committer:  Geert Uytterhoeven <geert <at> linux-m68k.org>
CommitDate: Sat Jul 30 21:21:38 2011 +0200

    m68k/amiga: Chip RAM - Offset resource end by CHIP_PHYSADDR

    Technically, the end of Chip RAM should be offset by CHIP_PHYSADDR (which is
    zero).

    Signed-off-by: Geert Uytterhoeven <geert <at> linux-m68k.org>
---
 arch/m68k/amiga/chipram.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/m68k/amiga/chipram.c b/arch/m68k/amiga/chipram.c
index cfd3b7a..4790f77 100644
--- a/arch/m68k/amiga/chipram.c
+++ b/arch/m68k/amiga/chipram.c
@@ -34,7 +34,7 @@ void __init amiga_chip_init(void)
 	if (!AMIGAHW_PRESENT(CHIP_RAM))
 		return;

-	chipram_res.end = amiga_chip_size-1;
+	chipram_res.end = CHIP_PHYSADDR + amiga_chip_size - 1;
 	request_resource(&iomem_resource, &chipram_res);

(Continue reading)

m68k/amiga: Chip RAM - Change chipavail to an atomic_t

Gitweb:     http://git.kernel.org/linus/cab49bc95d848a85d7108f896f6d21283f25f54c
Commit:     cab49bc95d848a85d7108f896f6d21283f25f54c
Parent:     3a17bfa4fb37e7f8e06ef31feafec559bd4c6699
Author:     Geert Uytterhoeven <geert <at> linux-m68k.org>
AuthorDate: Sun Apr 24 23:40:51 2011 +0200
Committer:  Geert Uytterhoeven <geert <at> linux-m68k.org>
CommitDate: Sat Jul 30 21:21:38 2011 +0200

    m68k/amiga: Chip RAM - Change chipavail to an atomic_t

    While the core resource handling code is safe, our global counter must
    still be protected against concurrent modifications.

    Signed-off-by: Geert Uytterhoeven <geert <at> linux-m68k.org>
---
 arch/m68k/amiga/chipram.c |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/arch/m68k/amiga/chipram.c b/arch/m68k/amiga/chipram.c
index e5a8dbc..c3fe451 100644
--- a/arch/m68k/amiga/chipram.c
+++ b/arch/m68k/amiga/chipram.c
@@ -16,6 +16,7 @@
 #include <linux/string.h>
 #include <linux/module.h>

+#include <asm/atomic.h>
 #include <asm/page.h>
 #include <asm/amigahw.h>

(Continue reading)

m68k/amiga: Chip RAM - Use lookup_resource()

Gitweb:     http://git.kernel.org/linus/b7785e954348465e1926d9c10ff3e49c207d4ec6
Commit:     b7785e954348465e1926d9c10ff3e49c207d4ec6
Parent:     1c388919d89ca35741e9c4d3255adf87f76f0c06
Author:     Geert Uytterhoeven <geert <at> linux-m68k.org>
AuthorDate: Sat May 7 20:56:00 2011 +0200
Committer:  Geert Uytterhoeven <geert <at> linux-m68k.org>
CommitDate: Sat Jul 30 21:21:39 2011 +0200

    m68k/amiga: Chip RAM - Use lookup_resource()

    Replace a custom implementation (which doesn't lock the resource tree) by a
    call to lookup_resource()

    Signed-off-by: Geert Uytterhoeven <geert <at> linux-m68k.org>
---
 arch/m68k/amiga/chipram.c |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/arch/m68k/amiga/chipram.c b/arch/m68k/amiga/chipram.c
index 4790f77..99449fb 100644
--- a/arch/m68k/amiga/chipram.c
+++ b/arch/m68k/amiga/chipram.c
@@ -93,21 +93,21 @@ void *amiga_chip_alloc_res(unsigned long size, struct resource *res)
 void amiga_chip_free(void *ptr)
 {
 	unsigned long start = ZTWO_PADDR(ptr);
-	struct resource **p, *res;
+	struct resource *res;
 	unsigned long size;

(Continue reading)

m68k/atari: Prefix GPIO_{IN,OUT} with CODEC_

Gitweb:     http://git.kernel.org/linus/398476195a561271654ecce0fa27330688d326df
Commit:     398476195a561271654ecce0fa27330688d326df
Parent:     a0e997c20a2fbe25b0f97fb7521cdbda341c7f0a
Author:     Geert Uytterhoeven <geert <at> linux-m68k.org>
AuthorDate: Wed Jun 8 20:20:58 2011 +0200
Committer:  Geert Uytterhoeven <geert <at> linux-m68k.org>
CommitDate: Sat Jul 30 21:21:39 2011 +0200

    m68k/atari: Prefix GPIO_{IN,OUT} with CODEC_

    These defines are way to generic, and cause conflicts:

    drivers/net/wireless/rtlwifi/rtl8192c/../rtl8192ce/reg.h:369:1: warning: "GPIO_IN" redefined
    drivers/net/wireless/rtlwifi/rtl8192c/../rtl8192ce/reg.h:370:1: warning: "GPIO_OUT" redefined
    drivers/net/wireless/rtlwifi/rtl8192se/reg.h:252:1: warning: "GPIO_IN" redefined
    drivers/net/wireless/rtlwifi/rtl8192se/reg.h:253:1: warning: "GPIO_OUT" redefined

    Signed-off-by: Geert Uytterhoeven <geert <at> linux-m68k.org>
---
 arch/m68k/include/asm/atarihw.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/m68k/include/asm/atarihw.h b/arch/m68k/include/asm/atarihw.h
index f51f709..0392b28 100644
--- a/arch/m68k/include/asm/atarihw.h
+++ b/arch/m68k/include/asm/atarihw.h
@@ -399,8 +399,8 @@ struct CODEC
 #define CODEC_OVERFLOW_LEFT     2
   u_char unused2, unused3, unused4, unused5;
   u_char gpio_directions;
(Continue reading)


Gmane