diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7a42846e51..40a887148c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* amd64-tdep.c (amd64_supply_xstateregset): Remove the unused
+	tdep.
+	(amd64_collect_xstateregset): Likewise.
+
 2010-04-09  Stan Shebs  <stan@codesourcery.com>
 
 	* tracepoint.c (trace_status_mi): Report frames created.
diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
index 1aa49b9eef..b0926ad04d 100644
--- a/gdb/amd64-tdep.c
+++ b/gdb/amd64-tdep.c
@@ -2217,7 +2217,6 @@ amd64_supply_xstateregset (const struct regset *regset,
 			   struct regcache *regcache, int regnum,
 			   const void *xstateregs, size_t len)
 {
-  const struct gdbarch_tdep *tdep = gdbarch_tdep (regset->arch);
   amd64_supply_xsave (regcache, regnum, xstateregs);
 }
 
@@ -2228,7 +2227,6 @@ amd64_collect_xstateregset (const struct regset *regset,
 			    const struct regcache *regcache,
 			    int regnum, void *xstateregs, size_t len)
 {
-  const struct gdbarch_tdep *tdep = gdbarch_tdep (regset->arch);
   amd64_collect_xsave (regcache, regnum, xstateregs, 1);
 }