Commit 0888e089 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/misc' 

- Add generic SZ_1T macro instead of a local one in pci-xgene.c (Christophe
  Leroy)

* remotes/lorenzo/pci/misc:
  sizes.h: Add SZ_1T macro
parents f4098554 0cc62aed

drivers/pci/controller/pci-xgene.c

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ 
#define EN_REG				0x00000001

#define OB_LO_IO			0x00000002

#define XGENE_PCIE_DEVICEID		0xE004

#define SZ_1T				(SZ_1G*1024ULL)

#define PIPE_PHY_RATE_RD(src)		((0xc000 & (u32)(src)) >> 0xe)



#define XGENE_V1_PCI_EXP_CAP		0x40

include/linux/sizes.h

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ 
#define SZ_8G				_AC(0x200000000, ULL)

#define SZ_16G				_AC(0x400000000, ULL)

#define SZ_32G				_AC(0x800000000, ULL)



#define SZ_1T				_AC(0x10000000000, ULL)

#define SZ_64T				_AC(0x400000000000, ULL)



#endif /* __LINUX_SIZES_H__ */