Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 19 Oct 2015 12:08:06 +0000 (UTC)
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r289577 - head/sys/ofed/include/linux
Message-ID:  <201510191208.t9JC86TJ073042@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hselasky
Date: Mon Oct 19 12:08:06 2015
New Revision: 289577
URL: https://svnweb.freebsd.org/changeset/base/289577

Log:
  Merge LinuxKPI changes from DragonflyBSD:
  - Map more Linux compiler related defines to FreeBSD ones.
  
  Sponsored by:	Mellanox Technologies

Modified:
  head/sys/ofed/include/linux/compiler.h
  head/sys/ofed/include/linux/types.h

Modified: head/sys/ofed/include/linux/compiler.h
==============================================================================
--- head/sys/ofed/include/linux/compiler.h	Mon Oct 19 12:04:20 2015	(r289576)
+++ head/sys/ofed/include/linux/compiler.h	Mon Oct 19 12:08:06 2015	(r289577)
@@ -2,7 +2,8 @@
  * Copyright (c) 2010 Isilon Systems, Inc.
  * Copyright (c) 2010 iX Systems, Inc.
  * Copyright (c) 2010 Panasas, Inc.
- * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd.
+ * Copyright (c) 2013-2015 Mellanox Technologies, Ltd.
+ * Copyright (c) 2015 François Tigeot
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -62,5 +63,12 @@
 #define typeof(x)			__typeof(x)
 
 #define	uninitialized_var(x)		x = x
+#define	__read_mostly __attribute__((__section__(".data.read_mostly")))
+#define	__always_unused			__unused
+#define	__must_check			__result_use_check
+
+#define	__printf(a,b)			__printflike(a,b)
+
+#define	barrier()			__asm__ __volatile__("": : :"memory")
 
 #endif	/* _LINUX_COMPILER_H_ */

Modified: head/sys/ofed/include/linux/types.h
==============================================================================
--- head/sys/ofed/include/linux/types.h	Mon Oct 19 12:04:20 2015	(r289576)
+++ head/sys/ofed/include/linux/types.h	Mon Oct 19 12:08:06 2015	(r289577)
@@ -36,8 +36,6 @@
 #include <linux/compiler.h>
 #include <asm/types.h>
 
-#define	__read_mostly __attribute__((__section__(".data.read_mostly")))
-
 #ifndef __bitwise__
 #ifdef __CHECKER__
 #define __bitwise__ __attribute__((bitwise))



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510191208.t9JC86TJ073042>