From d4d39a6a8f9b7d4ffe08d031d3eedb42e449667e Mon Sep 17 00:00:00 2001

From: Laura Abbott <labbott@redhat.com>

Date: Thu, 14 Dec 2017 14:50:52 -0800

Subject: [PATCH] perf: Remove FSF address

To: Peter Zijlstra <peterz@infradead.org>

To: Ingo Molnar <mingo@redhat.com>

To: Arnaldo Carvalho de Melo <acme@kernel.org>

Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>

Cc: Jiri Olsa <jolsa@redhat.com>

Cc: Namhyung Kim <namhyung@kernel.org>

Cc: linux-kernel@vger.kernel.org

Checkpatch in the kernel now complains about having the FSF address

in comments. Other tools such as rpmlint are now starting to do the

same thing. Remove the FSF address to reduce warnings on multiple tools.

Signed-off-by: Laura Abbott <labbott@redhat.com>

---

For context, I'm updating the packaging for perf in Fedora which

requires a code/output review. This got flagged during that review.

---

 tools/perf/arch/sh/util/dwarf-regs.c                   | 5 -----

 tools/perf/arch/x86/util/dwarf-regs.c                  | 5 -----

 tools/perf/builtin-probe.c                             | 5 -----

 tools/perf/jvmti/jvmti_agent.c                         | 4 ----

 tools/perf/scripts/perl/Perf-Trace-Util/Context.xs     | 5 -----

 tools/perf/scripts/python/Perf-Trace-Util/Context.c    | 5 -----

 tools/perf/util/dwarf-aux.c                            | 5 -----

 tools/perf/util/dwarf-aux.h                            | 5 -----

 tools/perf/util/intel-pt-decoder/inat.c                | 5 -----

 tools/perf/util/intel-pt-decoder/inat.h                | 5 -----

 tools/perf/util/intel-pt-decoder/inat_types.h          | 4 ----

 tools/perf/util/intel-pt-decoder/insn.c                | 4 ----

 tools/perf/util/intel-pt-decoder/insn.h                | 4 ----

 tools/perf/util/probe-event.c                          | 4 ----

 tools/perf/util/probe-finder.c                         | 4 ----

 tools/perf/util/scripting-engines/trace-event-perl.c   | 4 ----

 tools/perf/util/scripting-engines/trace-event-python.c | 4 ----

 tools/perf/util/trace-event-info.c                     | 4 ----

 tools/perf/util/trace-event-parse.c                    | 4 ----

 tools/perf/util/trace-event-read.c                     | 4 ----

 tools/perf/util/trace-event-scripting.c                | 4 ----

 21 files changed, 93 deletions(-)

diff --git a/tools/perf/arch/sh/util/dwarf-regs.c b/tools/perf/arch/sh/util/dwarf-regs.c

index f8dfa89696f4..e0eec911f099 100644

--- a/tools/perf/arch/sh/util/dwarf-regs.c

+++ b/tools/perf/arch/sh/util/dwarf-regs.c

@@ -12,11 +12,6 @@

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

- *

  */

 #include <stddef.h>

diff --git a/tools/perf/arch/x86/util/dwarf-regs.c b/tools/perf/arch/x86/util/dwarf-regs.c

index 1f86ee8fb831..c8e233f81324 100644

--- a/tools/perf/arch/x86/util/dwarf-regs.c

+++ b/tools/perf/arch/x86/util/dwarf-regs.c

@@ -13,11 +13,6 @@

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

- *

  */

 #include <stddef.h>

diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c

index c0065923a525..6f50f49b1383 100644

--- a/tools/perf/builtin-probe.c

+++ b/tools/perf/builtin-probe.c

@@ -14,11 +14,6 @@

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

- *

  */

 #include <sys/utsname.h>

 #include <sys/types.h>

diff --git a/tools/perf/jvmti/jvmti_agent.c b/tools/perf/jvmti/jvmti_agent.c

index cf36de7ea255..b68a64c3c34c 100644

--- a/tools/perf/jvmti/jvmti_agent.c

+++ b/tools/perf/jvmti/jvmti_agent.c

@@ -12,10 +12,6 @@

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

  * Lesser General Public License for more details.

  *

- * You should have received a copy of the GNU Lesser General Public

- * License along with this library; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- *

  * Copyright 2007 OProfile authors

  * Jens Wilke

  * Daniel Hansel

diff --git a/tools/perf/scripts/perl/Perf-Trace-Util/Context.xs b/tools/perf/scripts/perl/Perf-Trace-Util/Context.xs

index 8c7ea42444d1..f74f79dbdc55 100644

--- a/tools/perf/scripts/perl/Perf-Trace-Util/Context.xs

+++ b/tools/perf/scripts/perl/Perf-Trace-Util/Context.xs

@@ -12,11 +12,6 @@

  *  but WITHOUT ANY WARRANTY; without even the implied warranty of

  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with this program; if not, write to the Free Software

- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- *

  */

 #include "EXTERN.h"

diff --git a/tools/perf/scripts/python/Perf-Trace-Util/Context.c b/tools/perf/scripts/python/Perf-Trace-Util/Context.c

index fcd1dd667906..7b503f677d1f 100644

--- a/tools/perf/scripts/python/Perf-Trace-Util/Context.c

+++ b/tools/perf/scripts/python/Perf-Trace-Util/Context.c

@@ -12,11 +12,6 @@

  *  but WITHOUT ANY WARRANTY; without even the implied warranty of

  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with this program; if not, write to the Free Software

- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- *

  */

 #include <Python.h>

diff --git a/tools/perf/util/dwarf-aux.c b/tools/perf/util/dwarf-aux.c

index f5acda13dcfa..4e186c31b072 100644

--- a/tools/perf/util/dwarf-aux.c

+++ b/tools/perf/util/dwarf-aux.c

@@ -10,11 +10,6 @@

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

- *

  */

 #include <errno.h>

diff --git a/tools/perf/util/dwarf-aux.h b/tools/perf/util/dwarf-aux.h

index 8ac53bf1ec4e..0bc9107710b7 100644

--- a/tools/perf/util/dwarf-aux.h

+++ b/tools/perf/util/dwarf-aux.h

@@ -12,11 +12,6 @@

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

- *

  */

 #include <dwarf.h>

diff --git a/tools/perf/util/intel-pt-decoder/inat.c b/tools/perf/util/intel-pt-decoder/inat.c

index 906d94aa0a24..026bfb2f2ec7 100644

--- a/tools/perf/util/intel-pt-decoder/inat.c

+++ b/tools/perf/util/intel-pt-decoder/inat.c

@@ -12,11 +12,6 @@

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

- *

  */

 #include "insn.h"

diff --git a/tools/perf/util/intel-pt-decoder/inat.h b/tools/perf/util/intel-pt-decoder/inat.h

index 52dc8d911173..c23120fc20f8 100644

--- a/tools/perf/util/intel-pt-decoder/inat.h

+++ b/tools/perf/util/intel-pt-decoder/inat.h

@@ -14,11 +14,6 @@

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

- *

  */

 #include "inat_types.h"

diff --git a/tools/perf/util/intel-pt-decoder/inat_types.h b/tools/perf/util/intel-pt-decoder/inat_types.h

index cb3c20ce39cf..bba552825512 100644

--- a/tools/perf/util/intel-pt-decoder/inat_types.h

+++ b/tools/perf/util/intel-pt-decoder/inat_types.h

@@ -15,10 +15,6 @@

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

- *

  */

 /* Instruction attributes */

diff --git a/tools/perf/util/intel-pt-decoder/insn.c b/tools/perf/util/intel-pt-decoder/insn.c

index ca983e2bea8b..d34b5a04ca57 100644

--- a/tools/perf/util/intel-pt-decoder/insn.c

+++ b/tools/perf/util/intel-pt-decoder/insn.c

@@ -11,10 +11,6 @@

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

- *

  * Copyright (C) IBM Corporation, 2002, 2004, 2009

  */

diff --git a/tools/perf/util/intel-pt-decoder/insn.h b/tools/perf/util/intel-pt-decoder/insn.h

index e23578c7b1be..3bbd145e7862 100644

--- a/tools/perf/util/intel-pt-decoder/insn.h

+++ b/tools/perf/util/intel-pt-decoder/insn.h

@@ -13,10 +13,6 @@

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

- *

  * Copyright (C) IBM Corporation, 2009

  */

diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c

index b7aaf9b2294d..1b3d4dc9961d 100644

--- a/tools/perf/util/probe-event.c

+++ b/tools/perf/util/probe-event.c

@@ -13,10 +13,6 @@

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

- *

  */

 #include <inttypes.h>

diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c

index a5731de0e5eb..6877db93709b 100644

--- a/tools/perf/util/probe-finder.c

+++ b/tools/perf/util/probe-finder.c

@@ -13,10 +13,6 @@

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

- *

  */

 #include <inttypes.h>

diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c

index 7b79c413486b..38f0caf588d9 100644

--- a/tools/perf/util/scripting-engines/trace-event-perl.c

+++ b/tools/perf/util/scripting-engines/trace-event-perl.c

@@ -13,10 +13,6 @@

  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  *  GNU General Public License for more details.

  *

- *  You should have received a copy of the GNU General Public License

- *  along with this program; if not, write to the Free Software

- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- *

  */

 #include <inttypes.h>

diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c

index c7187f067d31..e4b78629c3b3 100644

--- a/tools/perf/util/scripting-engines/trace-event-python.c

+++ b/tools/perf/util/scripting-engines/trace-event-python.c

@@ -13,10 +13,6 @@

  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  *  GNU General Public License for more details.

  *

- *  You should have received a copy of the GNU General Public License

- *  along with this program; if not, write to the Free Software

- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- *

  */

 #include <Python.h>

diff --git a/tools/perf/util/trace-event-info.c b/tools/perf/util/trace-event-info.c

index d7f2113462fb..098c684b11a4 100644

--- a/tools/perf/util/trace-event-info.c

+++ b/tools/perf/util/trace-event-info.c

@@ -12,10 +12,6 @@

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- *

  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

  */

 #include "util.h"

diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c

index e0a6e9a6a053..216a1f9d9f6c 100644

--- a/tools/perf/util/trace-event-parse.c

+++ b/tools/perf/util/trace-event-parse.c

@@ -12,10 +12,6 @@

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- *

  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

  */

 #include <stdio.h>

diff --git a/tools/perf/util/trace-event-read.c b/tools/perf/util/trace-event-read.c

index 40b425949aa3..f7b6d2a2704f 100644

--- a/tools/perf/util/trace-event-read.c

+++ b/tools/perf/util/trace-event-read.c

@@ -12,10 +12,6 @@

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- *

  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

  */

 #include <dirent.h>

diff --git a/tools/perf/util/trace-event-scripting.c b/tools/perf/util/trace-event-scripting.c

index 0ac9077f62a2..2d7d0ae9620d 100644

--- a/tools/perf/util/trace-event-scripting.c

+++ b/tools/perf/util/trace-event-scripting.c

@@ -13,10 +13,6 @@

  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  *  GNU General Public License for more details.

  *

- *  You should have received a copy of the GNU General Public License

- *  along with this program; if not, write to the Free Software

- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- *

  */

 #include <stdio.h>

-- 

2.14.3