diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:17 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:37:38 +1000 |
| commit | 850e79f6d76a25226ea1f83647d02c44fad6c7c9 (patch) | |
| tree | 37d616d4d9a1326815385a653c312d6fd165693d /lib | |
| parent | 73ce0e98b5cb43239c81b8efe84bcfcf00f2ed6f (diff) | |
| download | nouveau-850e79f6d76a25226ea1f83647d02c44fad6c7c9.tar.gz | |
imem: improve management of instance memory
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/include/nvif/os.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/include/nvif/os.h b/lib/include/nvif/os.h index c81fad685..3c482cfe1 100644 --- a/lib/include/nvif/os.h +++ b/lib/include/nvif/os.h @@ -93,6 +93,10 @@ typedef dma_addr_t resource_size_t; #define ERR_PTR(err) ((void *)(long)(err)) #define PTR_ERR(ptr) ((long)(ptr)) #define IS_ERR(ptr) ((unsigned long)(ptr) >= (unsigned long)-4095) +#define IS_ERR_OR_NULL(ptr) ({ \ + void *_ptr = (ptr); \ + (!_ptr || IS_ERR(_ptr)); \ +}) #define jiffies (ktime_to_ns(ktime_get())) #define nsecs_to_jiffies(a) (a) @@ -599,6 +603,7 @@ void nvos_iounmap(void __iomem *ptr); #define iowrite32(b,a) *((volatile u32 *)(a)) = (b) #define iowrite32_native iowrite32 +#define memset_io memset #define memcpy_fromio memcpy #define memcpy_toio memcpy #define wmb() |