sync with kernel_common 3.0