Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix indexing convention of Linux __ffs/__ffs64 shims.

Browse Source 
They reject zero input, and yield zero-based indexing, unlike our
ffs/ffs64, which return zero for zero and yield one-based indexing.

May let nouveau make a little more progress toward booting!

Found by mrg@.
This commit is contained in:
riastradh 2015-10-13 00:42:20 +00:00
parent 90bf221e1f
commit f9e0bb4791
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/external/bsd/drm2/include/linux/bitops.h vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: bitops.h,v 1.9 2015/02/25 15:40:20 riastradh Exp $ */
/* $NetBSD: bitops.h,v 1.10 2015/10/13 00:42:20 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@ -42,16 +42,24 @@
#include <lib/libkern/libkern.h>
/*
* Linux __ffs/__ffs64 is zero-based; zero input is undefined. Our
* ffs/ffs is one-based; zero input yields zero.
*/
static inline unsigned long
__ffs(unsigned long x)
{
return ffs64(x);
KASSERT(x != 0);
return ffs64(x) - 1;
}
static inline unsigned long
__ffs64(uint64_t x)
{
return ffs64(x);
KASSERT(x != 0);
return ffs64(x) - 1;
}
static inline unsigned int