Skip to content

L
linux
Commit 48b8720c authored by David Mosberger's avatar David Mosberger
Browse files
Options

ia64: Minor formatting fix for two earlier patches.

parent af2f859d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
arch/ia64/kernel/process.c
View file @ 48b8720c
...@@ -173,8 +173,8 @@ __setup("nohalt", nohalt_setup); ...@@ -173,8 +173,8 @@ __setup("nohalt", nohalt_setup);
void void
default_idle (void) default_idle (void)
{ {
unsigned long pmu_active = ia64_getreg(_IA64_REG_PSR) & unsigned long pmu_active = ia64_getreg(_IA64_REG_PSR) & (IA64_PSR_PP | IA64_PSR_UP);
(IA64_PSR_PP | IA64_PSR_UP);
while (!need_resched()) while (!need_resched())
if (pal_halt && !pmu_active) if (pal_halt && !pmu_active)
safe_halt(); safe_halt();
......
include/asm-ia64/machvec.h
View file @ 48b8720c
...@@ -234,7 +234,7 @@ extern ia64_mv_dma_sync_single_for_cpu swiotlb_sync_single_for_cpu; ...@@ -234,7 +234,7 @@ extern ia64_mv_dma_sync_single_for_cpu swiotlb_sync_single_for_cpu;
extern ia64_mv_dma_sync_sg_for_cpu swiotlb_sync_sg_for_cpu; extern ia64_mv_dma_sync_sg_for_cpu swiotlb_sync_sg_for_cpu;
extern ia64_mv_dma_sync_single_for_device swiotlb_sync_single_for_device; extern ia64_mv_dma_sync_single_for_device swiotlb_sync_single_for_device;
extern ia64_mv_dma_sync_sg_for_device swiotlb_sync_sg_for_device; extern ia64_mv_dma_sync_sg_for_device swiotlb_sync_sg_for_device;
extern ia64_mv_dma_mapping_error swiotlb_dma_mapping_error; extern ia64_mv_dma_mapping_error swiotlb_dma_mapping_error;
extern ia64_mv_dma_supported swiotlb_dma_supported; extern ia64_mv_dma_supported swiotlb_dma_supported;
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7