Skip to content

Commit be90010

Browse files
committed
blktap: Remove __RD* macros
The __RD* macros are already defined in Xen's io/ring.h which is included through blkif.h and they have been there for years. In Xen 4.18 the macros changed for MISRA and now the definitions are out of sync leading to redefinition errors. Just remove the local versions and rely on the io/ring.h ones. Signed-off-by: Jason Andryuk <[email protected]>
1 parent c7494bd commit be90010

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

drivers/tapdisk-blktap.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,6 @@
6161
#define WARN(_f, _a...) tlog_syslog(TLOG_WARN, "WARNING: "_f "in %s:%d", \
6262
##_a, __func__, __LINE__)
6363

64-
#define __RD2(_x) (((_x) & 0x00000002) ? 0x2 : ((_x) & 0x1))
65-
#define __RD4(_x) (((_x) & 0x0000000c) ? __RD2((_x)>>2)<<2 : __RD2(_x))
66-
#define __RD8(_x) (((_x) & 0x000000f0) ? __RD4((_x)>>4)<<4 : __RD4(_x))
67-
#define __RD16(_x) (((_x) & 0x0000ff00) ? __RD8((_x)>>8)<<8 : __RD8(_x))
68-
#define __RD32(_x) (((_x) & 0xffff0000) ? __RD16((_x)>>16)<<16 : __RD16(_x))
69-
7064
#define BLKTAP_RD32(_n) __RD32(_n)
7165
#define BLKTAP_RING_SIZE __BLKTAP_RING_SIZE(PAGE_SIZE)
7266

0 commit comments

Comments
 (0)