Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90bf353b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

Pull misc kbuild updates from Michal Marek:
 - Fix for make O=... perf-tar*
 - make tags revamp and fix for the fallout.  Patch for warnings about
   line breaks inside DEFINE_PER_CPU macros is pending
 - New coccinelle test

* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  coccinelle: tests: unsigned value cannot be lesser than zero
  tags: Unify emacs and exuberant rules
  tags: Drop the _PE rule
  tags: Do not try to index defconfigs
  tags: Process Kconfig files in a single pass
  tags: Fix erroneous pattern match in a comment
  aic7xxx: Avoid name collision with <linux/list.h>
  tags: Treat header files as C code
  package Makefile: fix perf-tar targets when outdir is set
  scripts/tags.sh: Teach tags about more powerpc macros
parents af75d517 3f984cb3

drivers/scsi/aic7xxx/aic79xx.h

+2 −2
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ struct scb { 
};



TAILQ_HEAD(scb_tailq, scb);

LIST_HEAD(scb_list, scb);

BSD_LIST_HEAD(scb_list, scb);



struct scb_data {

	/*
@@ -1069,7 +1069,7 @@ struct ahd_softc { 
	/*

	 * SCBs that have been sent to the controller

	 */

	LIST_HEAD(, scb)	  pending_scbs;

	BSD_LIST_HEAD(, scb)	  pending_scbs;



	/*

	 * Current register window mode information.

drivers/scsi/aic7xxx/aic79xx_osm.h

+0 −5
Original line number Diff line number Diff line
@@ -65,11 +65,6 @@ 
/* Core SCSI definitions */

#define AIC_LIB_PREFIX ahd



/* Name space conflict with BSD queue macros */

#ifdef LIST_HEAD

#undef LIST_HEAD

#endif



#include "cam.h"

#include "queue.h"

#include "scsi_message.h"

drivers/scsi/aic7xxx/aic7xxx.h

+1 −1
Original line number Diff line number Diff line
@@ -916,7 +916,7 @@ struct ahc_softc { 
	/*

	 * SCBs that have been sent to the controller

	 */

	LIST_HEAD(, scb)	  pending_scbs;

	BSD_LIST_HEAD(, scb)	  pending_scbs;



	/*

	 * Counting lock for deferring the release of additional

drivers/scsi/aic7xxx/aic7xxx_osm.h

+0 −5
Original line number Diff line number Diff line
@@ -82,11 +82,6 @@ 
/* Core SCSI definitions */

#define AIC_LIB_PREFIX ahc



/* Name space conflict with BSD queue macros */

#ifdef LIST_HEAD

#undef LIST_HEAD

#endif



#include "cam.h"

#include "queue.h"

#include "scsi_message.h"

drivers/scsi/aic7xxx/queue.h

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ struct { \ 
/*

 * List declarations.

 */

#define	LIST_HEAD(name, type)						\

#define	BSD_LIST_HEAD(name, type)					\

struct name {								\

	struct type *lh_first;	/* first element */			\

}