trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iga...@apache.org
Subject [1/5] git commit: TS-1498 Fix header_filter plugin for ARM
Date Mon, 24 Sep 2012 14:26:41 GMT
Updated Branches:
  refs/heads/3.2.x 977176c97 -> 15a106fef


TS-1498 Fix header_filter plugin for ARM

Test/Review: zwoop, jpeach, igalic
Backport: igalic


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/15a106fe
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/15a106fe
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/15a106fe

Branch: refs/heads/3.2.x
Commit: 15a106feffa895039e5a969dda5eee1d032f3eb9
Parents: ddedf6a
Author: Leif Hedstrom <zwoop@apache.org>
Authored: Sun Sep 16 09:15:24 2012 -0600
Committer: Igor Galić <i.galic@brainsware.org>
Committed: Mon Sep 24 16:25:57 2012 +0200

----------------------------------------------------------------------
 CHANGES                      |    2 ++
 STATUS                       |    5 -----
 plugins/header_filter/lulu.h |    5 +++++
 3 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/15a106fe/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 1e0c35f..4eec466 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.2.3
 
+  *) [TS-1498] Fix header_filter plugin for ARM.
+
   *) [TS-1497] stats codes mess up when disk fail
 
   *) [TS-1436] Added Yahoo directory layout

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/15a106fe/STATUS
----------------------------------------------------------------------
diff --git a/STATUS b/STATUS
index af165a8..c3b8ce6 100644
--- a/STATUS
+++ b/STATUS
@@ -41,11 +41,6 @@ A list of all bugs open for the next development release can be found at
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
 
-  *) Fix header_filter plugin build for ARM
-   Trunk :a7baf7c8f1bb9206e17b9ac925e21e5beab08f56
-   Jira: https://issues.apache.org/jira/browse/TS-1498
-   +1: zwoop, jpeach, igalic
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/15a106fe/plugins/header_filter/lulu.h
----------------------------------------------------------------------
diff --git a/plugins/header_filter/lulu.h b/plugins/header_filter/lulu.h
index 0271738..49bd807 100644
--- a/plugins/header_filter/lulu.h
+++ b/plugins/header_filter/lulu.h
@@ -44,6 +44,11 @@
 #define mb()  __asm__ __volatile__ ( "mfence" : : : "memory")
 #define rmb() __asm__ __volatile__ ( "lfence" : : : "memory")
 #define wmb() __asm__ __volatile__ ( "" : : : "memory")
+#elif defined(__arm__)
+/* ToDo: Anything? */
+#define mb()
+#define rmb()
+#define wmb()
 #else
 #error "Define barriers"
 #endif


Mime
View raw message