linux-kernel - linux-next: manual merge of the tip tree with the sparc-next tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 14 May 2012 14:51:14 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Sam Ravnborg <sam@...nborg.org>,
	"David S. Miller" <davem@...emloft.net>
Subject: linux-next: manual merge of the tip tree with the sparc-next tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/sparc/include/asm/thread_info_32.h between commit e7b7e0c35655
("sparc32: drop btfixup for alloc_thread_info_node/free_thread_info")
from the sparc-next tree and commit f5e10287367d ("task_allocator: Use
config switches instead of magic defines") from the tip tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/sparc/include/asm/thread_info_32.h
index 74316de,b29498d..0000000
--- a/arch/sparc/include/asm/thread_info_32.h
+++ b/arch/sparc/include/asm/thread_info_32.h
@@@ -80,10 -80,11 +80,8 @@@ register struct thread_info *current_th
   */
  #define THREAD_INFO_ORDER  1
  
- #define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
- 
 -BTFIXUPDEF_CALL(struct thread_info *, alloc_thread_info_node, int)
 -#define alloc_thread_info_node(tsk, node) BTFIXUP_CALL(alloc_thread_info_node)(node)
 -
 -BTFIXUPDEF_CALL(void, free_thread_info, struct thread_info *)
 -#define free_thread_info(ti) BTFIXUP_CALL(free_thread_info)(ti)
 +struct thread_info * alloc_thread_info_node(struct task_struct *tsk, int node);
 +void free_thread_info(struct thread_info *);
  
  #endif /* __ASSEMBLY__ */
  

Content of type "application/pgp-signature" skipped