X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Ftable.c;h=79b9bc1bd2c8f7b8793aa2b5f6b8cbd7b8295a72;hb=23cad98c869ef5b7682f68c41db6403c1e855f5e;hp=5c1b82a4b69ac8938a340305b2b913ac9de14632;hpb=4885254becfd531f8a24adb33f8c62c2f17debb0;p=openvswitch diff --git a/datapath/table.c b/datapath/table.c index 5c1b82a4..79b9bc1b 100644 --- a/datapath/table.c +++ b/datapath/table.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010 Nicira Networks. + * Copyright (c) 2009, 2010, 2011 Nicira Networks. * Distributed under the terms of the GNU GPL version 2. * * Significant portions of this file may be copied from parts of the Linux @@ -51,7 +51,7 @@ static void free_buckets(struct tbl_bucket __rcu ***l1, unsigned int j; for (j = 0; j < TBL_L2_SIZE; j++) { - struct tbl_bucket *bucket = rcu_dereference(l2[j]); + struct tbl_bucket *bucket = (struct tbl_bucket __force *)l2[j]; if (!bucket) continue; @@ -98,7 +98,7 @@ struct tbl *tbl_create(unsigned int n_buckets) { struct tbl *table; - table = kzalloc(sizeof *table, GFP_KERNEL); + table = kzalloc(sizeof(*table), GFP_KERNEL); if (!table) goto err;