talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update and add various macros to the LinuxKPI and resolve a macro 

redefinition issue in the cxgb driver.

MFC after:	1 week
Sponsored by:	Mellanox Technologies
Reviewed by:	np @
This commit is contained in:
Hans Petter Selasky 2016-01-26 15:26:35 +00:00
parent 49b49cda41
commit fe68f570d4
6 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/compat/linuxkpi/common/include/asm/atomic.h
View File

@ -35,6 +35,8 @@
#include <sys/types.h>
#include <machine/atomic.h>
#define ATOMIC_INIT(x) { .counter = (x) }
typedef struct {
volatile int counter;
} atomic_t;

9
sys/compat/linuxkpi/common/include/linux/clocksource.h
View File

@ -2,7 +2,7 @@
* 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-2016 Mellanox Technologies, Ltd.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -29,12 +29,13 @@
* $FreeBSD$
*/
#ifndef _LINUX_CLOCKSOURCE_H
#define _LINUX_CLOCKSOURCE_H
#define _LINUX_CLOCKSOURCE_H
#include <asm/types.h>
#define CLOCKSOURCE_MASK(x) ((cycle_t)(-1ULL >> ((-(x)) & 63)))
/* clocksource cycle base type */
typedef u64 cycle_t;
#endif /* _LINUX_CLOCKSOURCE_H */
#endif /* _LINUX_CLOCKSOURCE_H */

4
sys/compat/linuxkpi/common/include/linux/completion.h
View File

@ -40,7 +40,9 @@ struct completion {
#define INIT_COMPLETION(c) \
((c).done = 0)
#define init_completion(c) \
((c)->done = 0)
do { (c)->done = 0; } while (0)
#define reinit_completion(c) \
do { (c)->done = 0; } while (0)
#define complete(c) \
linux_complete_common((c), 0)
#define complete_all(c) \

1
sys/compat/linuxkpi/common/include/linux/gfp.h
View File

@ -54,6 +54,7 @@
#define GFP_HIGHUSER M_WAITOK
#define GFP_HIGHUSER_MOVABLE M_WAITOK
#define GFP_IOFS M_NOWAIT
#define GFP_NOIO M_NOWAIT
static inline void *
page_address(struct page *page)

10
sys/compat/linuxkpi/common/include/linux/kernel.h
View File

@ -2,7 +2,7 @@
* Copyright (c) 2010 Isilon Systems, Inc.
* Copyright (c) 2010 iX Systems, Inc.
* Copyright (c) 2010 Panasas, Inc.
* Copyright (c) 2013-2015 Mellanox Technologies, Ltd.
* Copyright (c) 2013-2016 Mellanox Technologies, Ltd.
* Copyright (c) 2014-2015 François Tigeot
* All rights reserved.
*
@ -159,9 +159,10 @@
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
#define simple_strtoul strtoul
#define simple_strtol strtol
#define kstrtol(a,b,c) ({*(c) = strtol(a,0,b);})
#define simple_strtoul(...) strtoul(__VA_ARGS__)
#define simple_strtol(...) strtol(__VA_ARGS__)
#define kstrtol(a,b,c) ({*(c) = strtol(a,0,b); 0;})
#define kstrtoint(a,b,c) ({*(c) = strtol(a,0,b); 0;})
#define min(x, y) ((x) < (y) ? (x) : (y))
#define max(x, y) ((x) > (y) ? (x) : (y))
@ -185,6 +186,7 @@
#define round_up(x, y) ((((x)-1) | __round_mask(x, y))+1)
#define round_down(x, y) ((x) & ~__round_mask(x, y))
#define smp_processor_id() PCPU_GET(cpuid)
#define num_possible_cpus() mp_ncpus
#define num_online_cpus() mp_ncpus

4
sys/dev/cxgb/cxgb_osdep.h
View File

@ -231,7 +231,9 @@ static const int debug_flags = DBG_RX;
#define le16_to_cpu(x) le16toh(x)
#define cpu_to_le32(x) htole32(x)
#define swab32(x) bswap32(x)
#define simple_strtoul strtoul
#ifndef simple_strtoul
#define simple_strtoul(...) strtoul(__VA_ARGS__)
#endif
#ifndef LINUX_TYPES_DEFINED