[PATCH 0/2] Restructure va_high_addr_switch