> --- a/drivers/net/ethernet/ibm/ibmveth.c > +++ b/drivers/net/ethernet/ibm/ibmveth.c > @@ -978,8 +978,6 @@ static int ibmveth_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) > return -EOPNOTSUPP; > } > > -#define page_offset(v) ((unsigned long)(v) & ((1 << 12) - 1)) This one realy should be killed off in a separate patch, it has nothing to do with the kernel-wide page_offset. > +/* Legacy; please convert callers */ > +#define page_offset(page) file_offset_of_page(page) I'd say send a script to Linus to conver it as soon as the change is in.