[PATCH 1/5] asm-generic/mmu.h: Remove unused vmlist field from mm_context_t

[PATCH 1/5] asm-generic/mmu.h: Remove unused vmlist field from mm_context_t

[Lars-Peter Clausen]

Nothing is using the vmlist field in mm_context_t anymore. It has been removed
from the non-generic versions over 3 years ago 8feae1311 ("NOMMU: Make VMAs per
MM as for MMU-mode linux").

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 include/asm-generic/mmu.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/include/asm-generic/mmu.h b/include/asm-generic/mmu.h
index 4f4aa56..a67ae0a9 100644
--- a/include/asm-generic/mmu.h
+++ b/include/asm-generic/mmu.h
@@ -7,7 +7,6 @@
  */
 #ifndef __ASSEMBLY__
 typedef struct {
-	struct vm_list_struct	*vmlist;
 	unsigned long		end_brk;
 } mm_context_t;
 #endif
-- 
1.7.2.5

[PATCH 1/5] asm-generic/mmu.h: Remove unused vmlist field from mm_context_t

[Lars-Peter Clausen]

Nothing is using the vmlist field in mm_context_t anymore. It has been removed
from the non-generic versions over 3 years ago 8feae1311 ("NOMMU: Make VMAs per
MM as for MMU-mode linux").

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 include/asm-generic/mmu.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/include/asm-generic/mmu.h b/include/asm-generic/mmu.h
index 4f4aa56..a67ae0a9 100644
--- a/include/asm-generic/mmu.h
+++ b/include/asm-generic/mmu.h
@@ -7,7 +7,6 @@
  */
 #ifndef __ASSEMBLY__
 typedef struct {
-	struct vm_list_struct	*vmlist;
 	unsigned long		end_brk;
 } mm_context_t;
 #endif
-- 
1.7.2.5

[PATCH 2/5] asm-generic/mmu.h: Add support for FDPIC

[Lars-Peter Clausen]

No-MMU architectures often have support for FDPIC binaries. FDPIC support
requires two additional fields in the mm_context_t struct. This patch adds these
fields to the generic mm_context_t definition if support for FDPIC binaries is
enabled. This allows to use the generic mmu.h for a few more architectures.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 include/asm-generic/mmu.h |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/include/asm-generic/mmu.h b/include/asm-generic/mmu.h
index a67ae0a9..0ed3f1c 100644
--- a/include/asm-generic/mmu.h
+++ b/include/asm-generic/mmu.h
@@ -8,6 +8,11 @@
 #ifndef __ASSEMBLY__
 typedef struct {
 	unsigned long		end_brk;
+
+#ifdef CONFIG_BINFMT_ELF_FDPIC
+	unsigned long		exec_fdpic_loadmap;
+	unsigned long		interp_fdpic_loadmap;
+#endif
 } mm_context_t;
 #endif
 
-- 
1.7.2.5

[PATCH 2/5] asm-generic/mmu.h: Add support for FDPIC

[Lars-Peter Clausen]

No-MMU architectures often have support for FDPIC binaries. FDPIC support
requires two additional fields in the mm_context_t struct. This patch adds these
fields to the generic mm_context_t definition if support for FDPIC binaries is
enabled. This allows to use the generic mmu.h for a few more architectures.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 include/asm-generic/mmu.h |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/include/asm-generic/mmu.h b/include/asm-generic/mmu.h
index a67ae0a9..0ed3f1c 100644
--- a/include/asm-generic/mmu.h
+++ b/include/asm-generic/mmu.h
@@ -8,6 +8,11 @@
 #ifndef __ASSEMBLY__
 typedef struct {
 	unsigned long		end_brk;
+
+#ifdef CONFIG_BINFMT_ELF_FDPIC
+	unsigned long		exec_fdpic_loadmap;
+	unsigned long		interp_fdpic_loadmap;
+#endif
 } mm_context_t;
 #endif
 
-- 
1.7.2.5

[PATCH 3/5] h8300: Use generic asm/mmu.h

[Lars-Peter Clausen]

h8300's asm/mmu.h is basically identical to asm-generic/mmu.h, so use it instead
of the custom version.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>

---
Note, due to lack of toolchain, etc this patch is completely untested.
---
 arch/h8300/include/asm/Kbuild |    1 +
 arch/h8300/include/asm/mmu.h  |   10 ----------
 2 files changed, 1 insertions(+), 10 deletions(-)
 delete mode 100644 arch/h8300/include/asm/mmu.h

diff --git a/arch/h8300/include/asm/Kbuild b/arch/h8300/include/asm/Kbuild
index 50bbf38..173de77 100644
--- a/arch/h8300/include/asm/Kbuild
+++ b/arch/h8300/include/asm/Kbuild
@@ -2,4 +2,5 @@ include include/asm-generic/Kbuild.asm
 
 generic-y += clkdev.h
 generic-y += exec.h
+generic-y += mmu.h
 generic-y += module.h
diff --git a/arch/h8300/include/asm/mmu.h b/arch/h8300/include/asm/mmu.h
deleted file mode 100644
index 3130996..0000000
--- a/arch/h8300/include/asm/mmu.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __MMU_H
-#define __MMU_H
-
-/* Copyright (C) 2002, David McCullough <davidm@snapgear.com> */
-
-typedef struct {
-	unsigned long		end_brk;
-} mm_context_t;
-
-#endif
-- 
1.7.2.5

[PATCH 3/5] h8300: Use generic asm/mmu.h

[Lars-Peter Clausen]

h8300's asm/mmu.h is basically identical to asm-generic/mmu.h, so use it instead
of the custom version.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>

---
Note, due to lack of toolchain, etc this patch is completely untested.
---
 arch/h8300/include/asm/Kbuild |    1 +
 arch/h8300/include/asm/mmu.h  |   10 ----------
 2 files changed, 1 insertions(+), 10 deletions(-)
 delete mode 100644 arch/h8300/include/asm/mmu.h

diff --git a/arch/h8300/include/asm/Kbuild b/arch/h8300/include/asm/Kbuild
index 50bbf38..173de77 100644
--- a/arch/h8300/include/asm/Kbuild
+++ b/arch/h8300/include/asm/Kbuild
@@ -2,4 +2,5 @@ include include/asm-generic/Kbuild.asm
 
 generic-y += clkdev.h
 generic-y += exec.h
+generic-y += mmu.h
 generic-y += module.h
diff --git a/arch/h8300/include/asm/mmu.h b/arch/h8300/include/asm/mmu.h
deleted file mode 100644
index 3130996..0000000
--- a/arch/h8300/include/asm/mmu.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __MMU_H
-#define __MMU_H
-
-/* Copyright (C) 2002, David McCullough <davidm@snapgear.com> */
-
-typedef struct {
-	unsigned long		end_brk;
-} mm_context_t;
-
-#endif
-- 
1.7.2.5

[PATCH 4/5] c6x: Use generic asm/mmu.h

[Lars-Peter Clausen]

c6x's asm/mmu.h is basically identical to asm-generic/mmu.h, so use it instead
of the custom version.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>

---
Note, due to lack of toolchain, etc this patch is completely untested.
---
 arch/c6x/include/asm/Kbuild |    1 +
 arch/c6x/include/asm/mmu.h  |   22 ----------------------
 2 files changed, 1 insertions(+), 22 deletions(-)
 delete mode 100644 arch/c6x/include/asm/mmu.h

diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild
index 112a496..3c8b660 100644
--- a/arch/c6x/include/asm/Kbuild
+++ b/arch/c6x/include/asm/Kbuild
@@ -25,6 +25,7 @@ generic-y += kdebug.h
 generic-y += kmap_types.h
 generic-y += local.h
 generic-y += mman.h
+generic-y += mmu.h
 generic-y += mmu_context.h
 generic-y += msgbuf.h
 generic-y += param.h
diff --git a/arch/c6x/include/asm/mmu.h b/arch/c6x/include/asm/mmu.h
deleted file mode 100644
index 4467e77..0000000
--- a/arch/c6x/include/asm/mmu.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  Port on Texas Instruments TMS320C6x architecture
- *
- *  Copyright (C) 2004, 2009, 2010 Texas Instruments Incorporated
- *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- */
-#ifndef _ASM_C6X_MMU_H
-#define _ASM_C6X_MMU_H
-
-typedef struct {
-	unsigned long		end_brk;
-#ifdef CONFIG_BINFMT_ELF_FDPIC
-	unsigned long	exec_fdpic_loadmap;
-	unsigned long	interp_fdpic_loadmap;
-#endif
-} mm_context_t;
-
-#endif /* _ASM_C6X_MMU_H */
-- 
1.7.2.5

[PATCH 4/5] c6x: Use generic asm/mmu.h

[Lars-Peter Clausen]

c6x's asm/mmu.h is basically identical to asm-generic/mmu.h, so use it instead
of the custom version.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>

---
Note, due to lack of toolchain, etc this patch is completely untested.
---
 arch/c6x/include/asm/Kbuild |    1 +
 arch/c6x/include/asm/mmu.h  |   22 ----------------------
 2 files changed, 1 insertions(+), 22 deletions(-)
 delete mode 100644 arch/c6x/include/asm/mmu.h

diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild
index 112a496..3c8b660 100644
--- a/arch/c6x/include/asm/Kbuild
+++ b/arch/c6x/include/asm/Kbuild
@@ -25,6 +25,7 @@ generic-y += kdebug.h
 generic-y += kmap_types.h
 generic-y += local.h
 generic-y += mman.h
+generic-y += mmu.h
 generic-y += mmu_context.h
 generic-y += msgbuf.h
 generic-y += param.h
diff --git a/arch/c6x/include/asm/mmu.h b/arch/c6x/include/asm/mmu.h
deleted file mode 100644
index 4467e77..0000000
--- a/arch/c6x/include/asm/mmu.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  Port on Texas Instruments TMS320C6x architecture
- *
- *  Copyright (C) 2004, 2009, 2010 Texas Instruments Incorporated
- *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- */
-#ifndef _ASM_C6X_MMU_H
-#define _ASM_C6X_MMU_H
-
-typedef struct {
-	unsigned long		end_brk;
-#ifdef CONFIG_BINFMT_ELF_FDPIC
-	unsigned long	exec_fdpic_loadmap;
-	unsigned long	interp_fdpic_loadmap;
-#endif
-} mm_context_t;
-
-#endif /* _ASM_C6X_MMU_H */
-- 
1.7.2.5

Re: [PATCH 4/5] c6x: Use generic asm/mmu.h

[Mark Salter]

On Thu, 2012-11-01 at 11:24 +0100, Lars-Peter Clausen wrote:
> c6x's asm/mmu.h is basically identical to asm-generic/mmu.h, so use it
> instead
> of the custom version.
> 
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
> 
> ---
> Note, due to lack of toolchain, etc this patch is completely untested.
> ---
>  arch/c6x/include/asm/Kbuild |    1 +
>  arch/c6x/include/asm/mmu.h  |   22 ----------------------
>  2 files changed, 1 insertions(+), 22 deletions(-)
>  delete mode 100644 arch/c6x/include/asm/mmu.h

Acked-by: Mark Salter <msalter@redhat.com>
Tested-by: Mark Salter <msalter@redhat.com>

[PATCH 5/5] xtensa: Use generic asm/mmu.h for nommu

[Lars-Peter Clausen]

The nommu portion of mmu.h of the extensa platform is basically the same as the
asm-generic mmu.h. So use it instead.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>

---
Note, due to lack of toolchain, etc this patch is completely untested.
---
 arch/xtensa/include/asm/mmu.h   |    2 +-
 arch/xtensa/include/asm/nommu.h |    3 ---
 2 files changed, 1 insertions(+), 4 deletions(-)
 delete mode 100644 arch/xtensa/include/asm/nommu.h

diff --git a/arch/xtensa/include/asm/mmu.h b/arch/xtensa/include/asm/mmu.h
index 04890d6..8554b2c 100644
--- a/arch/xtensa/include/asm/mmu.h
+++ b/arch/xtensa/include/asm/mmu.h
@@ -12,7 +12,7 @@
 #define _XTENSA_MMU_H
 
 #ifndef CONFIG_MMU
-#include <asm/nommu.h>
+#include <asm-generic/mmu.h>
 #else
 
 /* Default "unsigned long" context */
diff --git a/arch/xtensa/include/asm/nommu.h b/arch/xtensa/include/asm/nommu.h
deleted file mode 100644
index dce2c43..0000000
--- a/arch/xtensa/include/asm/nommu.h
+++ /dev/null
@@ -1,3 +0,0 @@
-typedef struct {
-	unsigned long end_brk;
-} mm_context_t;
-- 
1.7.2.5

[PATCH 5/5] xtensa: Use generic asm/mmu.h for nommu

[Lars-Peter Clausen]

The nommu portion of mmu.h of the extensa platform is basically the same as the
asm-generic mmu.h. So use it instead.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>

---
Note, due to lack of toolchain, etc this patch is completely untested.
---
 arch/xtensa/include/asm/mmu.h   |    2 +-
 arch/xtensa/include/asm/nommu.h |    3 ---
 2 files changed, 1 insertions(+), 4 deletions(-)
 delete mode 100644 arch/xtensa/include/asm/nommu.h

diff --git a/arch/xtensa/include/asm/mmu.h b/arch/xtensa/include/asm/mmu.h
index 04890d6..8554b2c 100644
--- a/arch/xtensa/include/asm/mmu.h
+++ b/arch/xtensa/include/asm/mmu.h
@@ -12,7 +12,7 @@
 #define _XTENSA_MMU_H
 
 #ifndef CONFIG_MMU
-#include <asm/nommu.h>
+#include <asm-generic/mmu.h>
 #else
 
 /* Default "unsigned long" context */
diff --git a/arch/xtensa/include/asm/nommu.h b/arch/xtensa/include/asm/nommu.h
deleted file mode 100644
index dce2c43..0000000
--- a/arch/xtensa/include/asm/nommu.h
+++ /dev/null
@@ -1,3 +0,0 @@
-typedef struct {
-	unsigned long end_brk;
-} mm_context_t;
-- 
1.7.2.5

Re: [PATCH 5/5] xtensa: Use generic asm/mmu.h for nommu

[czankel]

Thanks Lars, I have added it to the Xtensa for_next tree.

-Chris

On 11/1/12 3:24 AM, Lars-Peter Clausen wrote:
> The nommu portion of mmu.h of the extensa platform is basically the same as the
> asm-generic mmu.h. So use it instead.
>
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
>
> ---
> Note, due to lack of toolchain, etc this patch is completely untested.
> ---
>   arch/xtensa/include/asm/mmu.h   |    2 +-
>   arch/xtensa/include/asm/nommu.h |    3 ---
>   2 files changed, 1 insertions(+), 4 deletions(-)
>   delete mode 100644 arch/xtensa/include/asm/nommu.h
>
> diff --git a/arch/xtensa/include/asm/mmu.h b/arch/xtensa/include/asm/mmu.h
> index 04890d6..8554b2c 100644
> --- a/arch/xtensa/include/asm/mmu.h
> +++ b/arch/xtensa/include/asm/mmu.h
> @@ -12,7 +12,7 @@
>   #define _XTENSA_MMU_H
>   
>   #ifndef CONFIG_MMU
> -#include <asm/nommu.h>
> +#include <asm-generic/mmu.h>
>   #else
>   
>   /* Default "unsigned long" context */
> diff --git a/arch/xtensa/include/asm/nommu.h b/arch/xtensa/include/asm/nommu.h
> deleted file mode 100644
> index dce2c43..0000000
> --- a/arch/xtensa/include/asm/nommu.h
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -typedef struct {
> -	unsigned long end_brk;
> -} mm_context_t;

Re: [PATCH 5/5] xtensa: Use generic asm/mmu.h for nommu

[Lars-Peter Clausen]

On 12/03/2012 09:28 AM, czankel wrote:
> Thanks Lars, I have added it to the Xtensa for_next tree.
> 
> -Chris

Hi,

While the patch works standalone. It would be better if it'd go through the
same tree as the other patches in this series. Patch 1 removes the unused
vmlist field from the mm_context_t struct in asm-generic/mmu.h. So without that
patch this patch basically doubles the size of your mm_context_t.

- Lars

> 
> On 11/1/12 3:24 AM, Lars-Peter Clausen wrote:
>> The nommu portion of mmu.h of the extensa platform is basically the
>> same as the
>> asm-generic mmu.h. So use it instead.
>>
>> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
>>
>> ---
>> Note, due to lack of toolchain, etc this patch is completely untested.
>> ---
>>   arch/xtensa/include/asm/mmu.h   |    2 +-
>>   arch/xtensa/include/asm/nommu.h |    3 ---
>>   2 files changed, 1 insertions(+), 4 deletions(-)
>>   delete mode 100644 arch/xtensa/include/asm/nommu.h
>>
>> diff --git a/arch/xtensa/include/asm/mmu.h
>> b/arch/xtensa/include/asm/mmu.h
>> index 04890d6..8554b2c 100644
>> --- a/arch/xtensa/include/asm/mmu.h
>> +++ b/arch/xtensa/include/asm/mmu.h
>> @@ -12,7 +12,7 @@
>>   #define _XTENSA_MMU_H
>>     #ifndef CONFIG_MMU
>> -#include <asm/nommu.h>
>> +#include <asm-generic/mmu.h>
>>   #else
>>     /* Default "unsigned long" context */
>> diff --git a/arch/xtensa/include/asm/nommu.h
>> b/arch/xtensa/include/asm/nommu.h
>> deleted file mode 100644
>> index dce2c43..0000000
>> --- a/arch/xtensa/include/asm/nommu.h
>> +++ /dev/null
>> @@ -1,3 +0,0 @@
>> -typedef struct {
>> -    unsigned long end_brk;
>> -} mm_context_t;
> 

Re: [PATCH 5/5] xtensa: Use generic asm/mmu.h for nommu

[czankel]

On 12/3/12 12:43 AM, Lars-Peter Clausen wrote:
> On 12/03/2012 09:28 AM, czankel wrote:
>> Thanks Lars, I have added it to the Xtensa for_next tree.
>>
>> -Chris
> Hi,
>
> While the patch works standalone. It would be better if it'd go through the
> same tree as the other patches in this series. Patch 1 removes the unused
> vmlist field from the mm_context_t struct in asm-generic/mmu.h. So without that
> patch this patch basically doubles the size of your mm_context_t.
OK, reverted it. Regarding the Xtensa patch,

Acked-by: Chris Zankel <chris@zankel.net>

Thanks,
-Chris

Re: [PATCH 1/5] asm-generic/mmu.h: Remove unused vmlist field from mm_context_t

[Arnd Bergmann]

On Thursday 01 November 2012, Lars-Peter Clausen wrote:
> Nothing is using the vmlist field in mm_context_t anymore. It has been removed
> from the non-generic versions over 3 years ago 8feae1311 ("NOMMU: Make VMAs per
> MM as for MMU-mode linux").
> 
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>

Whole series:

Acked-by: Arnd Bergmann <arnd@arndb.de>

Do you want to include the patches in a patch set of your own, or should I put them
into the asm-generic tree?

	Arnd

Re: [PATCH 1/5] asm-generic/mmu.h: Remove unused vmlist field from mm_context_t

[Lars-Peter Clausen]

On 12/04/2012 12:54 AM, Arnd Bergmann wrote:
> On Thursday 01 November 2012, Lars-Peter Clausen wrote:
>> Nothing is using the vmlist field in mm_context_t anymore. It has been removed
>> from the non-generic versions over 3 years ago 8feae1311 ("NOMMU: Make VMAs per
>> MM as for MMU-mode linux").
>>
>> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
> 
> Whole series:
> 
> Acked-by: Arnd Bergmann <arnd@arndb.de>
> 
> Do you want to include the patches in a patch set of your own, or should I put them
> into the asm-generic tree?
> 
> 	Arnd

Hi Arnd,

The plan was to let it go through the asm-generic tree.

Thanks,
- Lars

Re: [PATCH 1/5] asm-generic/mmu.h: Remove unused vmlist field from mm_context_t

[Lars-Peter Clausen]

On 12/04/2012 12:54 AM, Arnd Bergmann wrote:
> On Thursday 01 November 2012, Lars-Peter Clausen wrote:
>> Nothing is using the vmlist field in mm_context_t anymore. It has been removed
>> from the non-generic versions over 3 years ago 8feae1311 ("NOMMU: Make VMAs per
>> MM as for MMU-mode linux").
>>
>> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
> 
> Whole series:
> 
> Acked-by: Arnd Bergmann <arnd@arndb.de>
> 
> Do you want to include the patches in a patch set of your own, or should I put them
> into the asm-generic tree?
> 
> 	Arnd

Hi Arnd,

The plan was to let it go through the asm-generic tree.

Thanks,
- Lars

Re: [PATCH 1/5] asm-generic/mmu.h: Remove unused vmlist field from mm_context_t

[Arnd Bergmann]

On Tuesday 04 December 2012, Lars-Peter Clausen wrote:
> On 12/04/2012 12:54 AM, Arnd Bergmann wrote:
> > On Thursday 01 November 2012, Lars-Peter Clausen wrote:
> >> Nothing is using the vmlist field in mm_context_t anymore. It has been removed
> >> from the non-generic versions over 3 years ago 8feae1311 ("NOMMU: Make VMAs per
> >> MM as for MMU-mode linux").
> >>
> >> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
> > 
> > Whole series:
> > 
> > Acked-by: Arnd Bergmann <arnd@arndb.de>
> > 
> > Do you want to include the patches in a patch set of your own, or should I put them
> > into the asm-generic tree?
> > 
> >       Arnd
> 
> Hi Arnd,
> 
> The plan was to let it go through the asm-generic tree.

Sorry for all the delay. I've applied it now.

	Arnd