kernel: update 3.18 to 3.18.16

[15.05/openwrt.git] / target / linux / brcm47xx / patches-3.18 / 032-09-MIPS-BCM47xx-Add-helper-variable-for-storing-NVRAM-l.patch

diff --git a/target/linux/brcm47xx/patches-3.18/032-09-MIPS-BCM47xx-Add-helper-variable-for-storing-NVRAM-l.patch b/target/linux/brcm47xx/patches-3.18/032-09-MIPS-BCM47xx-Add-helper-variable-for-storing-NVRAM-l.patch
index ab7ceaa..053144a 100644 (file)
--- a/target/linux/brcm47xx/patches-3.18/032-09-MIPS-BCM47xx-Add-helper-variable-for-storing-NVRAM-l.patch
+++ b/target/linux/brcm47xx/patches-3.18/032-09-MIPS-BCM47xx-Add-helper-variable-for-storing-NVRAM-l.patch
@@ -24,8 +24,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  arch/mips/bcm47xx/nvram.c | 37 ++++++++++++++++---------------------
  1 file changed, 16 insertions(+), 21 deletions(-)
 
  arch/mips/bcm47xx/nvram.c | 37 ++++++++++++++++---------------------
  1 file changed, 16 insertions(+), 21 deletions(-)
 

-diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c
-index 2ed762e..9ccdce8 100644

 --- a/arch/mips/bcm47xx/nvram.c
 +++ b/arch/mips/bcm47xx/nvram.c
 @@ -35,6 +35,7 @@ struct nvram_header {
 --- a/arch/mips/bcm47xx/nvram.c
 +++ b/arch/mips/bcm47xx/nvram.c
 @@ -35,6 +35,7 @@ struct nvram_header {


@@ -36,7 +34,7 @@ index 2ed762e..9ccdce8 100644
  static const u32 nvram_sizes[] = {0x8000, 0xF000, 0x10000};
  
  static u32 find_nvram_size(void __iomem *end)
  static const u32 nvram_sizes[] = {0x8000, 0xF000, 0x10000};
  
  static u32 find_nvram_size(void __iomem *end)

-@@ -60,7 +61,7 @@ static int nvram_find_and_copy(void __iomem *iobase, u32 lim)
+@@ -60,7 +61,7 @@ static int nvram_find_and_copy(void __io

        u32 *src, *dst;
        u32 size;
  
        u32 *src, *dst;
        u32 size;
  


@@ -103,7 +101,7 @@ index 2ed762e..9ccdce8 100644
        }
  #endif
  
        }
  #endif
  

-@@ -183,7 +180,7 @@ int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len)
+@@ -183,7 +180,7 @@ int bcm47xx_nvram_getenv(const char *nam

        if (!name)
                return -EINVAL;
  
        if (!name)
                return -EINVAL;
  


@@ -112,7 +110,7 @@ index 2ed762e..9ccdce8 100644
                err = nvram_init();
                if (err)
                        return err;
                err = nvram_init();
                if (err)
                        return err;

-@@ -231,16 +228,14 @@ char *bcm47xx_nvram_get_contents(size_t *nvram_size)
+@@ -231,16 +228,14 @@ char *bcm47xx_nvram_get_contents(size_t

  {
        int err;
        char *nvram;
  {
        int err;
        char *nvram;


@@ -131,6 +129,3 @@ index 2ed762e..9ccdce8 100644
        nvram = vmalloc(*nvram_size);
        if (!nvram)
                return NULL;
        nvram = vmalloc(*nvram_size);
        if (!nvram)
                return NULL;

--- 
-1.8.4.5
-