Updated for 3.15 kernel