diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-12-25 13:00:02 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-12-25 13:00:02 -0500 |
| commit | 6ffa7dcb21f347ea5f11adb9e1249058d06c2708 (patch) | |
| tree | c3a47d1e948a527c2487778cf1f077c0407026d1 | |
| parent | f0d87c3482a8d22f443655d421c70851db49a18d (diff) | |
| download | 4.9-rt-patches-6ffa7dcb21f347ea5f11adb9e1249058d06c2708.tar.gz | |
UV: import trivial refresh for whitespace shufflert-v4.8-759-ga6c4e4cd4464
| -rw-r--r-- | patches/x86-UV-raw_spinlock-conversion.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/patches/x86-UV-raw_spinlock-conversion.patch b/patches/x86-UV-raw_spinlock-conversion.patch index d25fdfc7cfef4..60e206e9c1e42 100644 --- a/patches/x86-UV-raw_spinlock-conversion.patch +++ b/patches/x86-UV-raw_spinlock-conversion.patch @@ -15,7 +15,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- a/arch/x86/include/asm/uv/uv_bau.h +++ b/arch/x86/include/asm/uv/uv_bau.h -@@ -615,9 +615,9 @@ struct bau_control { +@@ -624,9 +624,9 @@ struct bau_control { cycles_t send_message; cycles_t period_end; cycles_t period_time; @@ -28,7 +28,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> /* tunables */ int max_concurr; int max_concurr_const; -@@ -776,15 +776,15 @@ static inline int atom_asr(short i, stru +@@ -815,15 +815,15 @@ static inline int atom_asr(short i, stru * to be lowered below the current 'v'. atomic_add_unless can only stop * on equal. */ @@ -50,7 +50,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- a/arch/x86/platform/uv/tlb_uv.c +++ b/arch/x86/platform/uv/tlb_uv.c -@@ -729,9 +729,9 @@ static void destination_plugged(struct b +@@ -748,9 +748,9 @@ static void destination_plugged(struct b quiesce_local_uvhub(hmaster); @@ -62,7 +62,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> end_uvhub_quiesce(hmaster); -@@ -751,9 +751,9 @@ static void destination_timeout(struct b +@@ -770,9 +770,9 @@ static void destination_timeout(struct b quiesce_local_uvhub(hmaster); @@ -74,7 +74,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> end_uvhub_quiesce(hmaster); -@@ -774,7 +774,7 @@ static void disable_for_period(struct ba +@@ -793,7 +793,7 @@ static void disable_for_period(struct ba cycles_t tm1; hmaster = bcp->uvhub_master; @@ -83,7 +83,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> if (!bcp->baudisabled) { stat->s_bau_disabled++; tm1 = get_cycles(); -@@ -787,7 +787,7 @@ static void disable_for_period(struct ba +@@ -806,7 +806,7 @@ static void disable_for_period(struct ba } } } @@ -92,7 +92,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> } static void count_max_concurr(int stat, struct bau_control *bcp, -@@ -850,7 +850,7 @@ static void record_send_stats(cycles_t t +@@ -869,7 +869,7 @@ static void record_send_stats(cycles_t t */ static void uv1_throttle(struct bau_control *hmaster, struct ptc_stats *stat) { @@ -101,7 +101,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> atomic_t *v; v = &hmaster->active_descriptor_count; -@@ -983,7 +983,7 @@ static int check_enable(struct bau_contr +@@ -1002,7 +1002,7 @@ static int check_enable(struct bau_contr struct bau_control *hmaster; hmaster = bcp->uvhub_master; @@ -110,7 +110,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> if (bcp->baudisabled && (get_cycles() >= bcp->set_bau_on_time)) { stat->s_bau_reenabled++; for_each_present_cpu(tcpu) { -@@ -995,10 +995,10 @@ static int check_enable(struct bau_contr +@@ -1014,10 +1014,10 @@ static int check_enable(struct bau_contr tbcp->period_giveups = 0; } } @@ -123,10 +123,10 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> return -1; } -@@ -1916,9 +1916,9 @@ static void __init init_per_cpu_tunables +@@ -1940,9 +1940,9 @@ static void __init init_per_cpu_tunables bcp->cong_reps = congested_reps; - bcp->disabled_period = sec_2_cycles(disabled_period); - bcp->giveup_limit = giveup_limit; + bcp->disabled_period = sec_2_cycles(disabled_period); + bcp->giveup_limit = giveup_limit; - spin_lock_init(&bcp->queue_lock); - spin_lock_init(&bcp->uvhub_lock); - spin_lock_init(&bcp->disable_lock); |