linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [GIT PULL] parisc fixes for 3.4-rc1
@ 2012-08-31 16:01 James Bottomley
  0 siblings, 0 replies; 4+ messages in thread
From: James Bottomley @ 2012-08-31 16:01 UTC (permalink / raw)
  To: Andrew Morton, Linus Torvalds; +Cc: Parisc List, linux-kernel

This is a set of two bug fixes.  One is the ATOMIC problem which is now
causing a compile failure in certain situations.  The other is
mishandling of PER_LINUX32 which may also cause user visible effects.

The patches are here:

git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git parisc-fixes

The short changelog is:

Jiri Kosina (1):
      fix personality flag check in copy_thread()

Mel Gorman (1):
      Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts

And the diffstat:

 arch/parisc/include/asm/atomic.h | 4 ++--
 arch/parisc/kernel/process.c     | 2 +-
 arch/parisc/kernel/sys_parisc.c  | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

Full diff below.

James

---

diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
index 6c6defc..af9cf30 100644
--- a/arch/parisc/include/asm/atomic.h
+++ b/arch/parisc/include/asm/atomic.h
@@ -141,7 +141,7 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
 
 #define atomic_sub_and_test(i,v)	(atomic_sub_return((i),(v)) == 0)
 
-#define ATOMIC_INIT(i)	((atomic_t) { (i) })
+#define ATOMIC_INIT(i)	{ (i) }
 
 #define smp_mb__before_atomic_dec()	smp_mb()
 #define smp_mb__after_atomic_dec()	smp_mb()
@@ -150,7 +150,7 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
 
 #ifdef CONFIG_64BIT
 
-#define ATOMIC64_INIT(i) ((atomic64_t) { (i) })
+#define ATOMIC64_INIT(i) { (i) }
 
 static __inline__ s64
 __atomic64_add_return(s64 i, atomic64_t *v)
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c
index d4b94b3..2c05a92 100644
--- a/arch/parisc/kernel/process.c
+++ b/arch/parisc/kernel/process.c
@@ -309,7 +309,7 @@ copy_thread(unsigned long clone_flags, unsigned long usp,
 		cregs->ksp = (unsigned long)stack
 			+ (pregs->gr[21] & (THREAD_SIZE - 1));
 		cregs->gr[30] = usp;
-		if (p->personality == PER_HPUX) {
+		if (personality(p->personality) == PER_HPUX) {
 #ifdef CONFIG_HPUX
 			cregs->kpc = (unsigned long) &hpux_child_return;
 #else
diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
index c9b9322..7426e40 100644
--- a/arch/parisc/kernel/sys_parisc.c
+++ b/arch/parisc/kernel/sys_parisc.c
@@ -225,12 +225,12 @@ long parisc_personality(unsigned long personality)
 	long err;
 
 	if (personality(current->personality) == PER_LINUX32
-	    && personality == PER_LINUX)
-		personality = PER_LINUX32;
+	    && personality(personality) == PER_LINUX)
+		personality = (personality & ~PER_MASK) | PER_LINUX32;
 
 	err = sys_personality(personality);
-	if (err == PER_LINUX32)
-		err = PER_LINUX;
+	if (personality(err) == PER_LINUX32)
+		err = (err & ~PER_MASK) | PER_LINUX;
 
 	return err;
 }



^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [GIT PULL] parisc fixes for 3.4-rc1
  2012-06-07  5:52 ` Greg KH
@ 2012-06-07  5:59   ` James Bottomley
  0 siblings, 0 replies; 4+ messages in thread
From: James Bottomley @ 2012-06-07  5:59 UTC (permalink / raw)
  To: Greg KH; +Cc: Andrew Morton, Linus Torvalds, Parisc List, linux-kernel

On Thu, 2012-06-07 at 14:52 +0900, Greg KH wrote:
> On Thu, Jun 07, 2012 at 02:38:13PM +0900, James Bottomley wrote:
> > This is a set of three bug fixes for minor build breakages that got
> > introduced just before 3.4-rc1 was released.
> 
> 3.4-rc1 or 3.5-rc1?  I ask as if this is 3.4-rc1, these should go to the
> stable tree, right?

Sorry, mislabel ... it's 3.5-rc1 ... they all fix breaks that were
introduced within the last week, so no need for a stable backport.

James



^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [GIT PULL] parisc fixes for 3.4-rc1
  2012-06-07  5:38 James Bottomley
@ 2012-06-07  5:52 ` Greg KH
  2012-06-07  5:59   ` James Bottomley
  0 siblings, 1 reply; 4+ messages in thread
From: Greg KH @ 2012-06-07  5:52 UTC (permalink / raw)
  To: James Bottomley; +Cc: Andrew Morton, Linus Torvalds, Parisc List, linux-kernel

On Thu, Jun 07, 2012 at 02:38:13PM +0900, James Bottomley wrote:
> This is a set of three bug fixes for minor build breakages that got
> introduced just before 3.4-rc1 was released.

3.4-rc1 or 3.5-rc1?  I ask as if this is 3.4-rc1, these should go to the
stable tree, right?

greg k-h

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [GIT PULL] parisc fixes for 3.4-rc1
@ 2012-06-07  5:38 James Bottomley
  2012-06-07  5:52 ` Greg KH
  0 siblings, 1 reply; 4+ messages in thread
From: James Bottomley @ 2012-06-07  5:38 UTC (permalink / raw)
  To: Andrew Morton, Linus Torvalds; +Cc: Parisc List, linux-kernel

This is a set of three bug fixes for minor build breakages that got
introduced just before 3.4-rc1 was released.

The patches are here:

git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git parisc-fixes

The short changelog is:

James Bottomley (3):
      fix code to find libgcc
      fix compile break in use of lib/strncopy_from_user.c
      fix missing TAINT_WARN problem

And the diffstat

 arch/parisc/Makefile           |    3 ++-
 arch/parisc/include/asm/Kbuild |    1 +
 arch/parisc/include/asm/bug.h  |    2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

Full diff is below.

James

---

diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile
index dbc3850..5707f1a 100644
--- a/arch/parisc/Makefile
+++ b/arch/parisc/Makefile
@@ -21,6 +21,7 @@ KBUILD_DEFCONFIG := default_defconfig
 
 NM		= sh $(srctree)/arch/parisc/nm
 CHECKFLAGS	+= -D__hppa__=1
+LIBGCC		= $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
 
 MACHINE		:= $(shell uname -m)
 ifeq ($(MACHINE),parisc*)
@@ -79,7 +80,7 @@ kernel-y			:= mm/ kernel/ math-emu/
 kernel-$(CONFIG_HPUX)		+= hpux/
 
 core-y	+= $(addprefix arch/parisc/, $(kernel-y))
-libs-y	+= arch/parisc/lib/ `$(CC) -print-libgcc-file-name`
+libs-y	+= arch/parisc/lib/ $(LIBGCC)
 
 drivers-$(CONFIG_OPROFILE)		+= arch/parisc/oprofile/
 
diff --git a/arch/parisc/include/asm/Kbuild b/arch/parisc/include/asm/Kbuild
index 19a434f..4383707 100644
--- a/arch/parisc/include/asm/Kbuild
+++ b/arch/parisc/include/asm/Kbuild
@@ -1,3 +1,4 @@
 include include/asm-generic/Kbuild.asm
 
 header-y += pdc.h
+generic-y += word-at-a-time.h
diff --git a/arch/parisc/include/asm/bug.h b/arch/parisc/include/asm/bug.h
index 72cfdb0..62a3333 100644
--- a/arch/parisc/include/asm/bug.h
+++ b/arch/parisc/include/asm/bug.h
@@ -1,6 +1,8 @@
 #ifndef _PARISC_BUG_H
 #define _PARISC_BUG_H
 
+#include <linux/kernel.h>	/* for BUGFLAG_TAINT */
+
 /*
  * Tell the user there is some problem.
  * The offending file and line are encoded in the __bug_table section.




^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2012-08-31 16:01 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-31 16:01 [GIT PULL] parisc fixes for 3.4-rc1 James Bottomley
  -- strict thread matches above, loose matches on Subject: below --
2012-06-07  5:38 James Bottomley
2012-06-07  5:52 ` Greg KH
2012-06-07  5:59   ` James Bottomley

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).